# ChangeLog for dev-vcs/hg-git
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hg-git/ChangeLog,v 1.25 2011/08/18 19:28:14 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hg-git/ChangeLog,v 1.26 2011/08/29 18:37:52 grobian Exp $
+
+*hg-git-0.2.6-r1 (29 Aug 2011)
+
+ 29 Aug 2011; Fabian Groffen <grobian@gentoo.org> +hg-git-0.2.6-r1.ebuild,
+ +files/hg-git-0.2.6-mercurial-1.9-1.patch,
+ +files/hg-git-0.2.6-mercurial-1.9-2.patch,
+ +files/hg-git-0.2.6-mercurial-1.9-3.patch,
+ +files/hg-git-0.2.6-mercurial-1.9-4.patch, metadata.xml:
+ Add patches from upstream to allow functioning properly with >=mercurial-1.9,
+ take co-maintainership, bug #375433
18 Aug 2011; Fabian Groffen <grobian@gentoo.org> hg-git-0.2.6.ebuild:
Marked ~x64-macos
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX hg-git-0.2.6-mercurial-1.9-1.patch 1037 RMD160 d7773908237893ba512067c65779f3159a98652e SHA1 e7d00c84467774e5f826dd29d705fe7367deffeb SHA256 a6d396a29b5595689d6a28a9b885229e601b435ae5c8aebea797440dbc890aaa
+AUX hg-git-0.2.6-mercurial-1.9-2.patch 1101 RMD160 cbca0061a87ad3f3d667171036964ffe8bf096db SHA1 2afa64a853f083e9253c4a9bff1d9ed3812ca3ce SHA256 f700dce1e9d4b7ed093ddd4c987bf77e86f059b003e0b8536d18312c3bf74d4b
+AUX hg-git-0.2.6-mercurial-1.9-3.patch 1367 RMD160 e6b95f8cf00aa9fb46385bda51ca3084c46d3dfc SHA1 7e6295f405c65b5b0be9f01be49b7c9cbe3cf93b SHA256 5f22089bfcf0afe390382a974f5b5209989b5ccf5c92ec1cf5a4e60039478f69
+AUX hg-git-0.2.6-mercurial-1.9-4.patch 1889 RMD160 c5d902307e6b24a1706eb8e909daf3b5ca37adf7 SHA1 97c0ae9159f255d6c8f166719b160560cbfddeef SHA256 946e552c8dfd2e60810a823a6091d7d80641e4bc1e3fe1357d150227b32b770c
DIST hg-git-0.2.6.tar.gz 12710 RMD160 8b58ba8848617c5f21335d462cca309aaf9b4678 SHA1 71ba1d32fc175152e306690c11cb913fe9c39133 SHA256 31b3b01632f090cde2fbc421b2d0e0b04c8e078595c314f5a0d90d8187a70d2d
+EBUILD hg-git-0.2.6-r1.ebuild 847 RMD160 7eeb1a2e94d91aa830d51dcfc17b88cb3debde22 SHA1 251152854131b8cc505befb961253b6d7cd28756 SHA256 0f7170ec442f0ad1f85333554bcb0cb18eb9f9278c00f712b69155319ffab68c
EBUILD hg-git-0.2.6.ebuild 759 RMD160 7126af81410b515dc20c752a5194866513af8adf SHA1 d30a4cfe58a36b004e26cd4755215f0ba169e986 SHA256 90a2d0403d2b49e98d503d940bc93ea5c3eb077e76fc1bfaf30cd1625e30edac
-MISC ChangeLog 3559 RMD160 1efc2cf01ae13473aee446ee5746db24b2dae8f5 SHA1 98d0db781644493744974268876ed115406659fe SHA256 0acaf92f76246951d54ca31253338e8ed2df8e70ef193be581fae2a5385e362b
-MISC metadata.xml 259 RMD160 6d8ae22c07d07d6022954f1402675be823f63e89 SHA1 3bf69a0327832c56dfe491f017cb585837fa4f06 SHA256 d0800a40fe0ff2558350ea33b80723d6a04c71b25625cfff11f724ec767109e4
+MISC ChangeLog 3980 RMD160 99ea4363621ed228da2969825eb46b923e217659 SHA1 fa945abc1919a23745469b3efe3116a2af2f397b SHA256 92ec694457372ec033458176ae0603003f59d2a767f76e4ec1e2c07459a7de4b
+MISC metadata.xml 360 RMD160 4eb294a7e4ba05b9740896787385e28d84a8324d SHA1 babe29eeec9fc1cee93a91f4936f344f4e7e7910 SHA256 5278ff5e7d3c794e7e7de7fa186b96497a656f2b8dc9524ec2c105bdd9db00e9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (Darwin)
-iEYEARECAAYFAk5NZ9MACgkQX3X2B8XHTokr6QCeLiBf19NFlAnkXphYqqs2zezT
-lHEAnjsJV6vO8hVqe6iPEpFlPwbzB6wy
-=2vbv
+iEYEARECAAYFAk5b3IYACgkQX3X2B8XHTolmIwCfb0iBsU4EFzp9D9K5V+RxqwKz
++cIAn2V5Pq1kVXzuQ12Zind9wGbIFpoN
+=0Yrs
-----END PGP SIGNATURE-----
--- /dev/null
+# HG changeset patch
+# User Mads Kiilerich <mads@kiilerich.com>
+# Date 1302003088 -7200
+# Node ID 61865ad887403865743391e682ce116ad817cd55
+# Parent f55869b556f0532604404966c612b326e360b7ca
+compatibility with new url handling in Mercurial 1.9
+
+diff -r f55869b556f0532604404966c612b326e360b7ca -r 61865ad887403865743391e682ce116ad817cd55 hggit/__init__.py
+--- a/hggit/__init__.py Wed Mar 23 21:31:26 2011 -0500
++++ b/hggit/__init__.py Tue Apr 05 13:31:28 2011 +0200
+@@ -24,6 +24,7 @@
+ from mercurial import hg
+ from mercurial import localrepo
+ from mercurial import util as hgutil
++from mercurial import url
+ from mercurial.i18n import _
+
+ demandimport.ignore.extend([
+@@ -42,7 +43,10 @@
+ _oldlocal = hg.schemes['file']
+
+ def _local(path):
+- p = hgutil.drop_scheme('file', path)
++ try:
++ p = hgutil.drop_scheme('file', path)
++ except AttributeError:
++ p = url.url(path).localpath()
+ if (os.path.exists(os.path.join(p, '.git')) and
+ not os.path.exists(os.path.join(p, '.hg'))):
+ return gitrepo
--- /dev/null
+# HG changeset patch
+# User Augie Fackler <durin42@gmail.com>
+# Date 1305480363 18000
+# Node ID bcc79fa3fe09c43a011936f7d8b2c1075e0d94da
+# Parent ed28dd69df6169396bfb72d4aa3349aac8a32ed1
+url wasn't ever published as url.url, and is now util.url
+
+diff -r ed28dd69df6169396bfb72d4aa3349aac8a32ed1 -r bcc79fa3fe09c43a011936f7d8b2c1075e0d94da hggit/__init__.py
+--- a/hggit/__init__.py Sun May 15 12:24:25 2011 -0500
++++ b/hggit/__init__.py Sun May 15 12:26:03 2011 -0500
+@@ -42,11 +42,18 @@
+ # support for `hg clone localgitrepo`
+ _oldlocal = hg.schemes['file']
+
++try:
++ urlcls = hgutil.url
++except AttributeError:
++ class urlcls(object):
++ def __init__(self, path):
++ self.p = hgutil.drop_scheme('file', path)
++
++ def localpath(self):
++ return self.p
++
+ def _local(path):
+- try:
+- p = hgutil.drop_scheme('file', path)
+- except AttributeError:
+- p = url.url(path).localpath()
++ p = urlcls(path).localpath()
+ if (os.path.exists(os.path.join(p, '.git')) and
+ not os.path.exists(os.path.join(p, '.hg'))):
+ return gitrepo
--- /dev/null
+# HG changeset patch
+# User Augie Fackler <durin42@gmail.com>
+# Date 1305480384 18000
+# Node ID 5fdff9b8e7420572624dae2941251f11cd9bd6d7
+# Parent bcc79fa3fe09c43a011936f7d8b2c1075e0d94da
+Cope with new discovery code without crashing.
+
+diff -r bcc79fa3fe09c43a011936f7d8b2c1075e0d94da -r 5fdff9b8e7420572624dae2941251f11cd9bd6d7 hggit/__init__.py
+--- a/hggit/__init__.py Sun May 15 12:26:03 2011 -0500
++++ b/hggit/__init__.py Sun May 15 12:26:24 2011 -0500
+@@ -125,6 +125,8 @@
+ kwname = 'heads'
+ if hg.util.version() >= '1.7':
+ kwname = 'remoteheads'
++ if getattr(discovery, 'findcommonoutgoing', None):
++ kwname = 'onlyheads'
+ def findoutgoing(orig, local, remote, *args, **kwargs):
+ kw = {}
+ kw.update(kwargs)
+@@ -141,8 +143,14 @@
+ if kwname == 'heads':
+ r = orig(local, remote, **kw)
+ return [x[0] for x in r]
++ if kwname == 'onlyheads':
++ del kw['base']
+ return orig(local, remote, **kw)
+- extensions.wrapfunction(discovery, 'findoutgoing', findoutgoing)
++ if getattr(discovery, 'findoutgoing', None):
++ extensions.wrapfunction(discovery, 'findoutgoing', findoutgoing)
++ else:
++ extensions.wrapfunction(discovery, 'findcommonoutgoing',
++ findoutgoing)
+ except ImportError:
+ pass
+
--- /dev/null
+# HG changeset patch
+# User Brendan Cully <brendan@kublai.com>
+# Date 1308853770 25200
+# Node ID 6867b01d1379cb27faca4c4cb06ed2fba38963e8
+# Parent b8eeabb61c7b720713565a645aacffa7213128aa
+Unbreak outgoing to non-git repos with hg pre-1.9
+
+The wrapped version of findoutgoing unconditionally mangled the
+keyword arguments, but doesn't do version fixups unless the
+remote is a git repository. This change only mangles the argument
+list when the remote is a git repository.
+
+diff -r b8eeabb61c7b720713565a645aacffa7213128aa -r 6867b01d1379cb27faca4c4cb06ed2fba38963e8 hggit/__init__.py
+--- a/hggit/__init__.py Fri Jun 17 15:01:31 2011 -0500
++++ b/hggit/__init__.py Thu Jun 23 11:29:30 2011 -0700
+@@ -129,13 +129,13 @@
+ if getattr(discovery, 'findcommonoutgoing', None):
+ kwname = 'onlyheads'
+ def findoutgoing(orig, local, remote, *args, **kwargs):
+- kw = {}
+- kw.update(kwargs)
+- for val, k in zip(args, ('base', kwname, 'force')):
+- kw[k] = val
+ if isinstance(remote, gitrepo.gitrepo):
+ # clean up this cruft when we're 1.7-only, remoteheads and
+ # the return value change happened between 1.6 and 1.7.
++ kw = {}
++ kw.update(kwargs)
++ for val, k in zip(args, ('base', kwname, 'force')):
++ kw[k] = val
+ git = GitHandler(local, local.ui)
+ base, heads = git.get_refs(remote.path)
+ newkw = {'base': base, kwname: heads}
+@@ -146,7 +146,8 @@
+ return [x[0] for x in r]
+ if kwname == 'onlyheads':
+ del kw['base']
+- return orig(local, remote, **kw)
++ return orig(local, remote, **kw)
++ return orig(local, remote, *args, **kwargs)
+ if getattr(discovery, 'findoutgoing', None):
+ extensions.wrapfunction(discovery, 'findoutgoing', findoutgoing)
+ else:
--- /dev/null
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hg-git/hg-git-0.2.6-r1.ebuild,v 1.1 2011/08/29 18:37:52 grobian Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit distutils eutils
+
+DESCRIPTION="push and pull from a Git server using Mercurial"
+HOMEPAGE="http://hg-git.github.com/ http://pypi.python.org/pypi/hg-git"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-vcs/mercurial-1.1
+ >=dev-python/dulwich-0.6"
+DEPEND="${RDEPEND}
+ dev-python/setuptools"
+
+PYTHON_MODNAME="hggit"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-mercurial-1.9-{1,2,3,4}.patch
+}
<email>djc@gentoo.org</email>
<name>Dirkjan Ochtman</name>
</maintainer>
+ <maintainer>
+ <email>grobian@gentoo.org</email>
+ <name>Fabian Groffen</name>
+ </maintainer>
<herd>python</herd>
</pkgmetadata>
projects / gentoo.git / commitdiff