From owner-svn-ports-head@FreeBSD.ORG Mon Oct 14 12:10:41 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 593CD81D; Mon, 14 Oct 2013 12:10:41 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 35DB4223E; Mon, 14 Oct 2013 12:10:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ECAf2U076035; Mon, 14 Oct 2013 12:10:41 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ECAeW7076032; Mon, 14 Oct 2013 12:10:40 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201310141210.r9ECAeW7076032@svn.freebsd.org> From: William Grzybowski Date: Mon, 14 Oct 2013 12:10:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330310 - in head/devel/hg-git: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 12:10:41 -0000 Author: wg Date: Mon Oct 14 12:10:40 2013 New Revision: 330310 URL: http://svnweb.freebsd.org/changeset/ports/330310 Log: devel/hg-git: allow staging - Allow staging - Use python auto plist - Patch for dulwich API change PR: ports/182747 Submitted by: Marco Bröder (maintainer) Added: head/devel/hg-git/files/patch-hggit__git_handler.py (contents, props changed) Deleted: head/devel/hg-git/pkg-plist Modified: head/devel/hg-git/Makefile head/devel/hg-git/pkg-message Modified: head/devel/hg-git/Makefile ============================================================================== --- head/devel/hg-git/Makefile Mon Oct 14 12:09:05 2013 (r330309) +++ head/devel/hg-git/Makefile Mon Oct 14 12:10:40 2013 (r330310) @@ -12,17 +12,13 @@ COMMENT= Mercurial extension to pull fro LICENSE= GPLv2 -RUN_DEPENDS= ${PKGNAMEPREFIX}dulwich>=0.8.7:${PORTSDIR}/devel/dulwich \ - mercurial>=2.5.2:${PORTSDIR}/devel/mercurial \ +RUN_DEPENDS= ${PKGNAMEPREFIX}dulwich>=*:${PORTSDIR}/devel/dulwich \ + mercurial>=*:${PORTSDIR}/devel/mercurial \ ${PKGNAMEPREFIX}ordereddict>=1.1:${PORTSDIR}/devel/py-ordereddict - -USE_PYTHON= -2.7 +USE_PYTHON= 2 USE_PYDISTUTILS=yes +PYDISTUTILS_AUTOPLIST= yes PYDISTUTILS_PKGNAME= ${PORTNAME:S/-/_/} -NO_STAGE= yes -post-install: - @${CAT} ${PKGMESSAGE} - .include Added: head/devel/hg-git/files/patch-hggit__git_handler.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/hg-git/files/patch-hggit__git_handler.py Mon Oct 14 12:10:40 2013 (r330310) @@ -0,0 +1,11 @@ +--- ./hggit/git_handler.py.orig 2013-03-24 22:35:51.000000000 +0100 ++++ ./hggit/git_handler.py 2013-10-05 10:40:01.222598222 +0200 +@@ -1034,7 +1034,7 @@ + and ( ref.startswith('refs/heads/') or ref.startswith('refs/tags/') ) ] + want = [x for x in want if x not in self.git] + return want +- f, commit = self.git.object_store.add_pack() ++ f, commit = self.git.object_store.add_pack()[:2] + try: + try: + progress = GitProgress(self.ui) Modified: head/devel/hg-git/pkg-message ============================================================================== --- head/devel/hg-git/pkg-message Mon Oct 14 12:09:05 2013 (r330309) +++ head/devel/hg-git/pkg-message Mon Oct 14 12:10:40 2013 (r330310) @@ -1,15 +1,14 @@ ==== -*** WARNING: Do not use this software in data critical production environments, -only in safe test environments! This software is still BETA! *** +To enable the Hg-Git extension it has to be added in either -To enable the Hg-Git extension make sure you have the following lines in your -Mercurial global configuration file '~/.hgrc': +'$PREFIX/etc/mercurial/hgrc' (per-system), +'$HOME/.hgrc' (per-user) or +'/.hg/hgrc' (per-repository) + +Mercurial configuration file: [extensions] hggit = -Note: As of Mercurial 1.8 the required bookmarks extension became a core -functionality and can be removed from the extensions list. - ====