From 84c8bc584ddbeefb462c66bca4c15f996a8ef954 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Sat, 13 May 2023 21:17:21 +0000 Subject: [PATCH] WIP: git-remote-hg: update to 0.6 --- devel/git-remote-hg/Makefile | 17 ++++--- devel/git-remote-hg/distinfo | 7 ++- .../git-remote-hg/patches/patch-git-remote-hg | 51 ------------------- 3 files changed, 14 insertions(+), 61 deletions(-) delete mode 100644 devel/git-remote-hg/patches/patch-git-remote-hg diff --git a/devel/git-remote-hg/Makefile b/devel/git-remote-hg/Makefile index 8a03a831ded2..e626aefae1c8 100644 --- a/devel/git-remote-hg/Makefile +++ b/devel/git-remote-hg/Makefile @@ -1,7 +1,6 @@ # $NetBSD: Makefile,v 1.5 2022/06/30 11:18:14 nia Exp $ -DISTNAME= git-remote-hg-20140603 -PKGREVISION= 4 +DISTNAME= git-remote-hg-20220819.0.6 CATEGORIES= devel scm MASTER_SITES= ${MASTER_SITE_GITHUB:=felipec/} @@ -11,18 +10,24 @@ COMMENT= Bridge support in git for mercurial LICENSE= gnu-gpl-v2 GITHUB_PROJECT= git-remote-hg -GITHUB_TAG= aa528c9649bf0fd8031656f21679c380aedc6b82 -WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG} +GITHUB_TAG= v0.6 -BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc +TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor>=0:../../textproc/ruby-asciidoctor + +SUBST_CLASSES+= asciidoctor +SUBST_STAGE.asciidoctor= pre-configure +SUBST_MESSAGE.asciidoctor= Fixing asciidoctor executable name. +SUBST_FILES.asciidoctor= Makefile +SUBST_SED.asciidoctor= -e 's,asciidoctor,&${RUBY_SUFFIX},g' USE_TOOLS+= gmake MAKE_FLAGS+= prefix=${PREFIX} MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR}/man1 REPLACE_PYTHON= git-remote-hg -INSTALL_TARGET= install install-doc +INSTALL_TARGET= install AUTO_MKDIRS= yes .include "../../lang/python/application.mk" +.include "../../lang/ruby/rubyversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/git-remote-hg/distinfo b/devel/git-remote-hg/distinfo index 9775f13580dd..097f13d004f4 100644 --- a/devel/git-remote-hg/distinfo +++ b/devel/git-remote-hg/distinfo @@ -1,6 +1,5 @@ $NetBSD: distinfo,v 1.3 2021/10/26 10:14:42 nia Exp $ -BLAKE2s (git-remote-hg-20140603-aa528c9649bf0fd8031656f21679c380aedc6b82.tar.gz) = d76cea1de2db0bbc6ffccab1e37b4a78855ca82a36527f563ab2e8f009f940da -SHA512 (git-remote-hg-20140603-aa528c9649bf0fd8031656f21679c380aedc6b82.tar.gz) = ab86c2190d09a85acd47e83cd96d966ae6355b9ed9c33eae051adcda0317365ee1c52380d16f766455ebdcc4e341f31f767de90783343435a287ec0aaeaf957f -Size (git-remote-hg-20140603-aa528c9649bf0fd8031656f21679c380aedc6b82.tar.gz) = 30835 bytes -SHA1 (patch-git-remote-hg) = cc2b80d31c2f547cacdd43225f9bd7f4f42174f8 +BLAKE2s (git-remote-hg-20220819.0.6.tar.gz) = 01418218359533f85cfa066c690d4c274f95e3fd9ef3df06896387d7c54105fb +SHA512 (git-remote-hg-20220819.0.6.tar.gz) = 694d37a9633453a25f9d189604f699843c98b450f6db763511693c4690c6b772c867a7bd12781380f27d51dee4e018589cd48971a999e93fc052842a33919108 +Size (git-remote-hg-20220819.0.6.tar.gz) = 38166 bytes diff --git a/devel/git-remote-hg/patches/patch-git-remote-hg b/devel/git-remote-hg/patches/patch-git-remote-hg deleted file mode 100644 index 1937d579a828..000000000000 --- a/devel/git-remote-hg/patches/patch-git-remote-hg +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-git-remote-hg,v 1.1 2015/11/26 08:30:57 agc Exp $ - -Patch to fix a crash caused by incompatible changes in mercurial API, -see: - - https://github.com/felipec/git-remote-hg/issues/33 - -and - - https://github.com/felipec/git-remote-hg/pull/28/files - ---- git-remote-hg 2015/11/25 21:51:36 1.1 -+++ git-remote-hg 2015/11/25 21:56:29 -@@ -430,7 +430,12 @@ - peer = hg.peer(repo.ui, {}, url) - except: - die('Repository error') -- repo.pull(peer, heads=None, force=True) -+ -+ if check_version(3, 2): -+ from mercurial import exchange -+ exchange.pull(repo, peer, heads=None, force=True) -+ else: -+ repo.pull(peer, heads=None, force=True) - - updatebookmarks(repo, peer) - -@@ -803,7 +808,11 @@ - def getfilectx(repo, memctx, f): - of = files[f] - if 'deleted' in of: -- raise IOError -+ # the file is not available anymore - was deleted -+ if check_version(3, 2): -+ return None -+ else: -+ raise IOError - if 'ctx' in of: - return of['ctx'] - is_exec = of['mode'] == 'x' -@@ -1036,7 +1045,9 @@ - if not checkheads(repo, remote, p_revs): - return None - -- if check_version(3, 0): -+ if check_version(3, 2): -+ cg = changegroup.getchangegroup(repo, 'push', heads=list(p_revs), common=common) -+ elif check_version(3, 0): - cg = changegroup.getbundle(repo, 'push', heads=list(p_revs), common=common) - else: - cg = repo.getbundle('push', heads=list(p_revs), common=common)