From owner-svn-ports-all@FreeBSD.ORG Sun May 3 07:30:33 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E0E9CF9A; Sun, 3 May 2015 07:30:33 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B50A11D04; Sun, 3 May 2015 07:30:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t437UXEx004959; Sun, 3 May 2015 07:30:33 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t437UXh4004957; Sun, 3 May 2015 07:30:33 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201505030730.t437UXh4004957@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 3 May 2015 07:30:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385234 - 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-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 May 2015 07:30:34 -0000 Author: jbeich Date: Sun May 3 07:30:32 2015 New Revision: 385234 URL: https://svnweb.freebsd.org/changeset/ports/385234 Log: devel/hg-git: fix when using with mercurial >= 3.3.3 PR: 199262 Submitted by: Quentin Schwerkolt Approved by: Marco Bröder (maintainer) Obtained from: https://github.com/schacon/hg-git/commit/6331251 Added: head/devel/hg-git/files/ head/devel/hg-git/files/patch-hggit_gitdirstate.py (contents, props changed) Modified: head/devel/hg-git/Makefile (contents, props changed) Modified: head/devel/hg-git/Makefile ============================================================================== --- head/devel/hg-git/Makefile Sun May 3 07:30:18 2015 (r385233) +++ head/devel/hg-git/Makefile Sun May 3 07:30:32 2015 (r385234) @@ -3,6 +3,7 @@ PORTNAME= hg-git PORTVERSION= 0.8.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Added: head/devel/hg-git/files/patch-hggit_gitdirstate.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/hg-git/files/patch-hggit_gitdirstate.py Sun May 3 07:30:32 2015 (r385234) @@ -0,0 +1,15 @@ +--- hggit/gitdirstate.py.orig 2014-05-09 14:26:29 UTC ++++ hggit/gitdirstate.py +@@ -161,7 +161,11 @@ class gitdirstate(dirstate.dirstate): + results, work, dirsnotfound = self._walkexplicit(match, subrepos) + + skipstep3 = skipstep3 and not (work or dirsnotfound) +- work = [d for d in work if not dirignore(d)] ++ if work and isinstance(work[0], tuple): ++ # Mercurial >= 3.3.3 ++ work = [nd for nd, d in work if not dirignore(d)] ++ else: ++ work = [d for d in work if not dirignore(d)] + wadd = work.append + + # step 2: visit subdirectories