* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/hg-git/files/, dev-vcs/hg-git/
@ 2016-08-02 8:37 Lars Wendler
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2016-08-02 8:37 UTC (permalink / raw
To: gentoo-commits
commit: 0b4b434a766712e43a13ee40cefc1e0ab8194f74
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 2 08:37:33 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Aug 2 08:37:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b4b434a
dev-vcs/hg-git: Removed old (QA fix).
Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
dev-vcs/hg-git/Manifest | 4 ---
.../hg-git-0.3.4-git_handler-bookmarks-hg25.patch | 31 ----------------------
dev-vcs/hg-git/hg-git-0.7.0.ebuild | 26 ------------------
dev-vcs/hg-git/hg-git-0.8.2.ebuild | 25 -----------------
dev-vcs/hg-git/hg-git-0.8.3.ebuild | 25 -----------------
dev-vcs/hg-git/hg-git-0.8.4.ebuild | 25 -----------------
6 files changed, 136 deletions(-)
diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index 975d844..c264bbf 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -1,5 +1 @@
-DIST hg-git-0.7.0.tar.gz 42956 SHA256 9db9cd87b9b173c192b29336b4029122a4fe2858c369dc8c5a59228515bc61a9 SHA512 732dbd12184a5346310b6d14bb0b24c2255ff607ef54d064387b7cadd64aa84dd2d6909e6dde36f9fa8ac8131c1adc315c2bae2e068066864c086b239524d5d4 WHIRLPOOL 0c8216da9fdaebc2fcb56d7bec12e9a087570cf032d253e77833cbf8f31a2d581d85b820c51e37cd519ce720bd49fec5be27211b58b64fb9c18b1fff1c24d26e
-DIST hg-git-0.8.2.tar.gz 48461 SHA256 fea6f48da28cef3fc30a51b1cfec0a52df405b35c85b2d92607158f6b089e043 SHA512 7315e60d494b73862e6c3a90624f5ba0698c885f9b66e4bfe636bb74cd178a0d5a23614c647b6d16db7f78c06516e9a8415c443effb6cc1a102cf87ac76aa041 WHIRLPOOL 1437bfa6a0ccf2e15cc3eef195a6b176606f2be74d2b1381524a1fef3431e1f8b8e0c537325daa5a11d1b709630cc282acebdffddbf602144f115e76aea61270
-DIST hg-git-0.8.3.tar.gz 48198 SHA256 5c624af512c969ac3628fd658670e9170812f570eb02d2a6c76c216b80341179 SHA512 857961004103ccdabb7d15d778ef7044a5f17dd0dd045f402269b5cbf8faf1a9a4f56d2d0d5b9d24a2d6c54a0d791ad079598d5f930f4d12d3290ad3f9b90207 WHIRLPOOL 657d5cb85fe003596919db44bd53eba60e88b56fd7ca6ef8f8833c37a9b5088cceea180e83e8edde9e2a8ccd3a356722d6d01d7980819aac6460ea789fdb4406
-DIST hg-git-0.8.4.tar.gz 96421 SHA256 aa8f1d4ccf110480950a7de82f30c1233e20c8148a384f0a8f43779686cfd90c SHA512 9a6d01489eaf9252a09c3778ddbde562f31637a7d8d9b67f544af5aaec31426ab74f05e065405c56ad37d58ae82ef702ef5a6e1ad9a9ea5aa23af98cf42726b1 WHIRLPOOL beb6b37911f9b4cff902fa35a857eb79b6eb4adca0077c2413801b93f64b6f450df5781716c31ccc6075313ab3d08ded2ea3011f767442945f694f414bdfe0fc
DIST hg-git-0.8.5.tar.gz 96675 SHA256 f5cab3cc610926458733a2321ad3df5a7c56870bbf0c6d962dfa742e6ea04782 SHA512 f03c118b58c1ba4cb34ba8c953c7b1d57207548cd613d1f9f716691cbd131008b802ef21baee484881c72318f46c78b946c2d3fa77ebf5efb3ab0b7e1b9d4ca2 WHIRLPOOL cf5c2e8b69b2489aa459b9c25a51dae67bc044075f2271b1ae1006113651a0053d748a1c8801fecf7d8e8d57f219a1d04ad7cd5256acfc96feecbb7d62bae264
diff --git a/dev-vcs/hg-git/files/hg-git-0.3.4-git_handler-bookmarks-hg25.patch b/dev-vcs/hg-git/files/hg-git-0.3.4-git_handler-bookmarks-hg25.patch
deleted file mode 100644
index 2d3e06a..0000000
--- a/dev-vcs/hg-git/files/hg-git-0.3.4-git_handler-bookmarks-hg25.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 90904fffd50fa95cd9c0f4f9210a2e800b08a50d Mon Sep 17 00:00:00 2001
-From: "David M. Carr" <david@carrclan.us>
-Date: Thu, 22 Nov 2012 18:44:09 -0500
-Subject: [PATCH] git_handler: add bookmark compatibility with new bmstore
- (issue #60)
-
-Prior to this fix, tests against the latest hg codebase would fail with:
-creating bookmarks failed, do you have bookmarks enabled?
----
- hggit/git_handler.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/hggit/git_handler.py b/hggit/git_handler.py
-index 2563e1b..a14c770 100644
---- a/hggit/git_handler.py
-+++ b/hggit/git_handler.py
-@@ -1044,7 +1044,10 @@ def update_hg_bookmarks(self, refs):
- bookmarks.write(self.repo, bms)
- else:
- self.repo._bookmarks = bms
-- bookmarks.write(self.repo)
-+ if getattr(bms, 'write', None): # hg >= 2.5
-+ bms.write()
-+ else: # hg < 2.5
-+ bookmarks.write(self.repo)
-
- except AttributeError:
- self.ui.warn(_('creating bookmarks failed, do you have'
---
-1.8.1.5
-
diff --git a/dev-vcs/hg-git/hg-git-0.7.0.ebuild b/dev-vcs/hg-git/hg-git-0.7.0.ebuild
deleted file mode 100644
index 89016f5..0000000
--- a/dev-vcs/hg-git/hg-git-0.7.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="push to and pull from a Git repository using Mercurial"
-HOMEPAGE="http://hg-git.github.io https://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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
- >=dev-vcs/mercurial-1.9.3[${PYTHON_USEDEP}]
- <dev-vcs/mercurial-3.3.3[${PYTHON_USEDEP}]
- >=dev-python/dulwich-0.9.4[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-vcs/hg-git/hg-git-0.8.2.ebuild b/dev-vcs/hg-git/hg-git-0.8.2.ebuild
deleted file mode 100644
index e2c3fb3..0000000
--- a/dev-vcs/hg-git/hg-git-0.8.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="push to and pull from a Git repository using Mercurial"
-HOMEPAGE="http://hg-git.github.io https://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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
- >=dev-vcs/mercurial-1.9.3[${PYTHON_USEDEP}]
- >=dev-python/dulwich-0.9.4[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-vcs/hg-git/hg-git-0.8.3.ebuild b/dev-vcs/hg-git/hg-git-0.8.3.ebuild
deleted file mode 100644
index e2c3fb3..0000000
--- a/dev-vcs/hg-git/hg-git-0.8.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="push to and pull from a Git repository using Mercurial"
-HOMEPAGE="http://hg-git.github.io https://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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
- >=dev-vcs/mercurial-1.9.3[${PYTHON_USEDEP}]
- >=dev-python/dulwich-0.9.4[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-vcs/hg-git/hg-git-0.8.4.ebuild b/dev-vcs/hg-git/hg-git-0.8.4.ebuild
deleted file mode 100644
index 55574cc..0000000
--- a/dev-vcs/hg-git/hg-git-0.8.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="push to and pull from a Git repository using Mercurial"
-HOMEPAGE="http://hg-git.github.io https://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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
- >=dev-vcs/mercurial-1.9.3[${PYTHON_USEDEP}]
- >=dev-python/dulwich-0.9.7[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/hg-git/files/, dev-vcs/hg-git/
@ 2019-01-08 8:29 Fabian Groffen
0 siblings, 0 replies; 2+ messages in thread
From: Fabian Groffen @ 2019-01-08 8:29 UTC (permalink / raw
To: gentoo-commits
commit: a6b4a73378a8051adb9bc3a7da7d62412f573139
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 8 08:28:32 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jan 8 08:28:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6b4a733
dev-vcs/hg-git: revbump for hg-4.8 support
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-vcs/hg-git/files/hg-git-0.8.12-hg-4.8.patch | 219 ++++++++++++++++++++++++
dev-vcs/hg-git/hg-git-0.8.12-r1.ebuild | 28 +++
2 files changed, 247 insertions(+)
diff --git a/dev-vcs/hg-git/files/hg-git-0.8.12-hg-4.8.patch b/dev-vcs/hg-git/files/hg-git-0.8.12-hg-4.8.patch
new file mode 100644
index 00000000000..c456ce53c74
--- /dev/null
+++ b/dev-vcs/hg-git/files/hg-git-0.8.12-hg-4.8.patch
@@ -0,0 +1,219 @@
+https://bitbucket.org/durin42/hg-git/commits/ae6b1ba7482963bc9de51f299891e99005794e4e/raw
+https://bitbucket.org/durin42/hg-git/commits/143b7511eadbea7507d847c805241a6db290ffe7/raw
+https://bitbucket.org/durin42/hg-git/commits/8d00fde45adbc6c3c0ccab8e362b5f5c36c171e6/raw
+
+# HG changeset patch
+# User Alain Leufroy
+# Date 1541695757 -3600
+# Node ID ae6b1ba7482963bc9de51f299891e99005794e4e
+# Parent 6ae26ba7b928019e48dd1c73358c18d6dd2d86f3
+compat: fix for hg 4.8
+
+089fc0db0954 introduced a new `createopts` parameter.
+
+`hggit` does not support repository creation, so we can just ignore
+it.
+
+diff --git a/hggit/gitrepo.py b/hggit/gitrepo.py
+--- a/hggit/gitrepo.py
++++ b/hggit/gitrepo.py
+@@ -13,7 +13,7 @@
+
+
+ class gitrepo(peerrepository):
+- def __init__(self, ui, path, create, intents=None):
++ def __init__(self, ui, path, create, intents=None, **kwargs):
+ if create: # pragma: no cover
+ raise error.Abort('Cannot create a git repository.')
+ self._ui = ui
+
+# HG changeset patch
+# User Kevin Bullock <kbullock@ringworld.org>
+# Date 1543713965 21600
+# Node ID 143b7511eadbea7507d847c805241a6db290ffe7
+# Parent ae6b1ba7482963bc9de51f299891e99005794e4e
+compat: glob some verify output that changed in hg 4.8
+
+diff --git a/tests/test-push-r.t b/tests/test-push-r.t
+--- a/tests/test-push-r.t
++++ b/tests/test-push-r.t
+@@ -64,7 +64,7 @@
+ checking manifests
+ crosschecking files in changesets and manifests
+ checking files
+- 1 files, 1 changesets, 1 total revisions
++ *1 changesets* (glob)
+ pushing to test-1
+ searching for changes
+ adding changesets
+@@ -75,7 +75,7 @@
+ checking manifests
+ crosschecking files in changesets and manifests
+ checking files
+- 1 files, 2 changesets, 2 total revisions
++ *2 changesets* (glob)
+ pushing to test-2
+ searching for changes
+ adding changesets
+@@ -86,7 +86,7 @@
+ checking manifests
+ crosschecking files in changesets and manifests
+ checking files
+- 1 files, 3 changesets, 3 total revisions
++ *3 changesets* (glob)
+ pushing to test-3
+ searching for changes
+ adding changesets
+@@ -97,7 +97,7 @@
+ checking manifests
+ crosschecking files in changesets and manifests
+ checking files
+- 1 files, 4 changesets, 4 total revisions
++ *4 changesets* (glob)
+ pushing to test-4
+ searching for changes
+ adding changesets
+@@ -108,7 +108,7 @@
+ checking manifests
+ crosschecking files in changesets and manifests
+ checking files
+- 1 files, 2 changesets, 2 total revisions
++ *2 changesets* (glob)
+ pushing to test-5
+ searching for changes
+ adding changesets
+@@ -119,7 +119,7 @@
+ checking manifests
+ crosschecking files in changesets and manifests
+ checking files
+- 1 files, 3 changesets, 3 total revisions
++ *3 changesets* (glob)
+ pushing to test-6
+ searching for changes
+ adding changesets
+@@ -130,7 +130,7 @@
+ checking manifests
+ crosschecking files in changesets and manifests
+ checking files
+- 2 files, 4 changesets, 5 total revisions
++ *4 changesets* (glob)
+ pushing to test-7
+ searching for changes
+ adding changesets
+@@ -141,7 +141,7 @@
+ checking manifests
+ crosschecking files in changesets and manifests
+ checking files
+- 3 files, 5 changesets, 6 total revisions
++ *5 changesets* (glob)
+ pushing to test-8
+ searching for changes
+ adding changesets
+@@ -152,7 +152,7 @@
+ checking manifests
+ crosschecking files in changesets and manifests
+ checking files
+- 2 files, 5 changesets, 5 total revisions
++ *5 changesets* (glob)
+ $ cd test-8
+ $ hg pull ../test-7
+ pulling from ../test-7
+@@ -168,4 +168,4 @@
+ checking manifests
+ crosschecking files in changesets and manifests
+ checking files
+- 4 files, 9 changesets, 7 total revisions
++ *9 changesets* (glob)
+
+# HG changeset patch
+# User Kevin Bullock <kbullock@ringworld.org>
+# Date 1543713996 21600
+# Node ID 8d00fde45adbc6c3c0ccab8e362b5f5c36c171e6
+# Parent 143b7511eadbea7507d847c805241a6db290ffe7
+compat: update how we register gitnode template keyword
+
+diff --git a/hggit/__init__.py b/hggit/__init__.py
+--- a/hggit/__init__.py
++++ b/hggit/__init__.py
+@@ -94,9 +94,11 @@
+ command = registrar.command(cmdtable)
+ configitem = registrar.configitem(configtable)
+ compat.registerconfigs(configitem)
++ templatekeyword = registrar.templatekeyword()
+
+ except (ImportError, AttributeError):
+ command = cmdutil.command(cmdtable)
++ templatekeyword = compat.templatekeyword()
+
+ # support for `hg clone git://github.com/defunkt/facebox.git`
+ # also hg clone git+ssh://git@github.com/schacon/simplegit.git
+@@ -207,7 +209,6 @@
+
+
+ def extsetup(ui):
+- templatekw.keywords.update({'gitnode': gitnodekw})
+ revset.symbols.update({
+ 'fromgit': revset_fromgit, 'gitnode': revset_gitnode
+ })
+@@ -455,12 +456,30 @@
+ raise LookupError(rev, git.map_file, _('ambiguous identifier'))
+
+
+-def gitnodekw(**args):
+- """:gitnode: String. The Git changeset identification hash, as a 40 hexadecimal
+-digit string."""
+- node = args['ctx']
+- repo = args['repo']
++def _gitnodekw(node, repo):
+ gitnode = repo.githandler.map_git_get(node.hex())
+ if gitnode is None:
+ gitnode = ''
+ return gitnode
++
++
++if (hgutil.safehasattr(templatekw, 'templatekeyword') and
++ hgutil.safehasattr(templatekw.templatekeyword._table['node'],
++ '_requires')):
++ @templatekeyword('gitnode', requires={'ctx', 'repo'})
++ def gitnodekw(context, mapping):
++ """:gitnode: String. The Git changeset identification hash, as a
++ 40 hexadecimal digit string."""
++ node = context.resource(mapping, 'ctx')
++ repo = context.resource(mapping, 'repo')
++ return _gitnodekw(node, repo)
++
++else:
++ # COMPAT: hg < 4.6 - templatekeyword API changed
++ @templatekeyword('gitnode')
++ def gitnodekw(**args):
++ """:gitnode: String. The Git changeset identification hash, as a
++ 40 hexadecimal digit string."""
++ node = args['ctx']
++ repo = args['repo']
++ return _gitnodekw(node, repo)
+diff --git a/hggit/compat.py b/hggit/compat.py
+--- a/hggit/compat.py
++++ b/hggit/compat.py
+@@ -2,6 +2,7 @@
+ bookmarks,
+ context,
+ phases,
++ templatekw,
+ url,
+ util as hgutil,
+ )
+@@ -192,3 +193,14 @@
+ if hasconfigitems:
+ return getconfig(section, item)
+ return getconfig(section, item, CONFIG_DEFAULTS[section][item])
++
++
++class templatekeyword(object):
++ def __init__(self):
++ self._table = {}
++
++ def __call__(self, name):
++ def decorate(func):
++ templatekw.keywords.update({name: func})
++ return func
++ return decorate
diff --git a/dev-vcs/hg-git/hg-git-0.8.12-r1.ebuild b/dev-vcs/hg-git/hg-git-0.8.12-r1.ebuild
new file mode 100644
index 00000000000..e5711f08ff4
--- /dev/null
+++ b/dev-vcs/hg-git/hg-git-0.8.12-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="push to and pull from a Git repository using Mercurial"
+HOMEPAGE="http://hg-git.github.io https://pypi.org/project/hg-git/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+ >=dev-vcs/mercurial-2.8.2[${PYTHON_USEDEP}]
+ >=dev-python/dulwich-0.9.7[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-hg-4.8.patch
+)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-08 8:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-08 8:29 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/hg-git/files/, dev-vcs/hg-git/ Fabian Groffen
-- strict thread matches above, loose matches on Subject: below --
2016-08-02 8:37 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox