Index: head/devel/hg-git/Makefile =================================================================== --- head/devel/hg-git/Makefile (revision 385233) +++ head/devel/hg-git/Makefile (revision 385234) @@ -1,29 +1,30 @@ # Created by: Marco Broeder # $FreeBSD$ PORTNAME= hg-git PORTVERSION= 0.8.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= marco.broeder@posteo.eu COMMENT= Mercurial extension to pull from or push to a Git repository LICENSE= GPLv2 RUN_DEPENDS= ${PKGNAMEPREFIX}dulwich>=*:${PORTSDIR}/devel/dulwich \ mercurial>=*:${PORTSDIR}/devel/mercurial PORTDOCS= README.md USES= python:2 USE_PYTHON= distutils autoplist OPTIONS_DEFINE= DOCS post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/) .include Index: head/devel/hg-git/files/patch-hggit_gitdirstate.py =================================================================== --- head/devel/hg-git/files/patch-hggit_gitdirstate.py (nonexistent) +++ head/devel/hg-git/files/patch-hggit_gitdirstate.py (revision 385234) @@ -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 Property changes on: head/devel/hg-git/files/patch-hggit_gitdirstate.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property