Attachment 155338 Details for Bug 199262 – Fix for incompatibility with Mercurial > 3.3.2

[patch] Fix for incompatibility with Mercurial > 3.3.2

hg-git_fix.patch (text/plain), 1.15 KB, created by Marco Bröder on 2015-04-08 11:57:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marco Bröder

Created: 2015-04-08 11:57:34 UTC

Size: 1.15 KB

patch

obsolete

>diff --git a/devel/hg-git/Makefile b/devel/hg-git/Makefile
>index 37d8ef3..c0768e1 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 0000000..fdf47e3
>--- /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

Flags:

marco.broeder: maintainer-approval+

Actions: View | Diff

Attachments on bug 199262: 155302 | 155338