From e851fe63829a092a79798cc4f355398e73d0fc5f Mon Sep 17 00:00:00 2001 From: icp Date: Tue, 5 Jul 2022 19:26:26 +0530 Subject: [PATCH] hg-git: update to 1.0.0. --- srcpkgs/hg-git/patches/fix-encoding-test.patch | 15 +++++++++++++++ srcpkgs/hg-git/template | 17 +++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 srcpkgs/hg-git/patches/fix-encoding-test.patch diff --git a/srcpkgs/hg-git/patches/fix-encoding-test.patch b/srcpkgs/hg-git/patches/fix-encoding-test.patch new file mode 100644 index 00000000000..944d4f2d96b --- /dev/null +++ b/srcpkgs/hg-git/patches/fix-encoding-test.patch @@ -0,0 +1,15 @@ +--- a/tests/test-encoding.t ++++ b/tests/test-encoding.t +@@ -33,10 +33,10 @@ + $ . $TESTDIR/latin-1-encoding + Warning: commit message (did|does) not conform to UTF-8. (re) + You may want to amend it after fixing the message, or set the config +- variable i18n.commitencoding to the encoding your project uses. ++ variable i18n.commitEncoding to the encoding your project uses. + Warning: commit message (did|does) not conform to UTF-8. (re) + You may want to amend it after fixing the message, or set the config +- variable i18n.commitencoding to the encoding your project uses. ++ variable i18n.commitEncoding to the encoding your project uses. + + $ cd .. + $ git init -q --bare repo.git diff --git a/srcpkgs/hg-git/template b/srcpkgs/hg-git/template index 37ef7e6b91e..89db4e79fff 100644 --- a/srcpkgs/hg-git/template +++ b/srcpkgs/hg-git/template @@ -1,9 +1,9 @@ # Template file for 'hg-git' pkgname=hg-git -version=0.9.0 -revision=3 +version=1.0.0 +revision=1 build_style=python3-module -hostmakedepends="python3-setuptools" +hostmakedepends="python3-setuptools python3-setuptools_scm" depends="python3-dulwich mercurial" checkdepends="$depends git unzip openssh" short_desc="Mercurial plugin adding the ability to push and pull to/from Git" @@ -11,18 +11,11 @@ maintainer="Orphaned " license="GPL-2.0-only" # https://www.mercurial-scm.org/wiki/HgGit homepage="https://foss.heptapod.net/mercurial/hg-git" +changelog="https://foss.heptapod.net/mercurial/hg-git/-/raw/branch/default/NEWS.rst" distfiles="$PYPI_SITE/h/hg-git/hg-git-$version.tar.gz" -checksum=77acbd8c322847ec109046d931e0731a91fcf13e10cfe9c183812706ec867671 +checksum=3911833962eb9c899c6bea8fb49666c82f211b124d0840beb6ad95e23a4621b6 do_check() { cd tests - rm -f test-branch-bookmark-suffix.t - # Git 2.28 appends merge into master, Git 2.29 reverts that change - rm -f test-merge.t test-octopus.t test-pull.t - # test hg serve, bind to localhost instead * - rm -f test-http.t - # Differ in warning, which is new in Git 2.28 - rm -f test-subrepos.t - python3 run-tests.py --with-hg=/usr/bin/hg }