diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2015-05-03 07:30:32 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2015-05-03 07:30:32 +0000 |
| commit | 605fcdb8acb5ebf65295ec410d49e4320d4768ec (patch) | |
| tree | 5effa015744dab92ea028d842a31cc4df3e52104 | |
| parent | net-mgmt/wmi-client: fix installation when PYTHON=on (diff) | |
devel/hg-git: fix when using with mercurial >= 3.3.3
PR: 199262
Submitted by: Quentin Schwerkolt <schwer_q.lists@outlook.com>
Approved by: Marco Bröder <marco.broeder@posteo.eu> (maintainer)
Obtained from: https://github.com/schacon/hg-git/commit/6331251
Notes
Notes:
svn path=/head/; revision=385234
| -rw-r--r-- | devel/hg-git/Makefile | 1 | ||||
| -rw-r--r-- | devel/hg-git/files/patch-hggit_gitdirstate.py | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/devel/hg-git/Makefile b/devel/hg-git/Makefile index fc2baf4e6c13..99843d5c2c00 100644 --- a/devel/hg-git/Makefile +++ b/devel/hg-git/Makefile @@ -3,6 +3,7 @@ PORTNAME= hg-git PORTVERSION= 0.8.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/hg-git/files/patch-hggit_gitdirstate.py b/devel/hg-git/files/patch-hggit_gitdirstate.py new file mode 100644 index 000000000000..fdf47e3178e6 --- /dev/null +++ b/devel/hg-git/files/patch-hggit_gitdirstate.py @@ -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 |