Attachment 155302 Details for Bug 199262 – Fix hg-git for mercurial >= 3.3.3

[patch] Fix hg-git for mercurial >= 3.3.3

hg-git.patch (text/plain), 3.26 KB, created by Quentin Schwerkolt on 2015-04-07 11:43:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Quentin Schwerkolt

Created: 2015-04-07 11:43:01 UTC

Size: 3.26 KB

patch

obsolete

>diff -rupN hg-git.bak/Makefile hg-git/Makefile
>--- hg-git.bak/Makefile	2015-04-07 14:21:56.297294000 +0300
>+++ hg-git/Makefile	2015-04-07 14:22:28.808756000 +0300
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	hg-git
> PORTVERSION=	0.8.0
>+PORTREVISION=	1
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff -rupN hg-git.bak/files/63312517680e285e8d7cfaf8154fca059a35e4ee.patch hg-git/files/63312517680e285e8d7cfaf8154fca059a35e4ee.patch
>--- hg-git.bak/files/63312517680e285e8d7cfaf8154fca059a35e4ee.patch	1970-01-01 04:00:00.000000000 +0400
>+++ hg-git/files/63312517680e285e8d7cfaf8154fca059a35e4ee.patch	2015-04-07 14:28:45.697746000 +0300
>@@ -0,0 +1,31 @@
>+From 63312517680e285e8d7cfaf8154fca059a35e4ee Mon Sep 17 00:00:00 2001
>+From: Siddharth Agarwal <sid0@fb.com>
>+Date: Fri, 3 Apr 2015 10:27:04 -0700
>+Subject: [PATCH] gitdirstate: use normalized path from _walkexplicit
>+
>+Since 2bb13f2b778c in Mercurial, _walkexplicit returns a tuple, so ensure
>+we are up to date and take the normalized path which is the first part of the
>+tuple.
>+
>+Based on a patch by David Soria Parra <davidsp@fb.com>.
>+---
>+ hggit/gitdirstate.py | 6 +++++-
>+ 1 file changed, 5 insertions(+), 1 deletion(-)
>+
>+diff --git a/hggit/gitdirstate.py b/hggit/gitdirstate.py
>+index 2cf1e34..4d8cdf4 100644
>+--- a/hggit/gitdirstate.py
>++++ b/hggit/gitdirstate.py
>+@@ -163,7 +163,11 @@ def fwarn(f, msg):
>+         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
>diff -rupN hg-git.bak/files/patch-hggit_gitdirstate.py hg-git/files/patch-hggit_gitdirstate.py
>--- hg-git.bak/files/patch-hggit_gitdirstate.py	1970-01-01 04:00:00.000000000 +0400
>+++ hg-git/files/patch-hggit_gitdirstate.py	2015-04-07 14:29:07.879589000 +0300
>@@ -0,0 +1,29 @@
>+From 63312517680e285e8d7cfaf8154fca059a35e4ee Mon Sep 17 00:00:00 2001
>+From: Siddharth Agarwal <sid0@fb.com>
>+Date: Fri, 3 Apr 2015 10:27:04 -0700
>+Subject: [PATCH] gitdirstate: use normalized path from _walkexplicit
>+
>+Since 2bb13f2b778c in Mercurial, _walkexplicit returns a tuple, so ensure
>+we are up to date and take the normalized path which is the first part of the
>+tuple.
>+
>+Based on a patch by David Soria Parra <davidsp@fb.com>.
>+---
>+ hggit/gitdirstate.py | 6 +++++-
>+ 1 file changed, 5 insertions(+), 1 deletion(-)
>+
>+--- 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

Actions: View | Diff

Attachments on bug 199262: 155302 | 155338