diff -Nru git-remote-hg-0.4/debian/changelog git-remote-hg-1.0.0~ds/debian/changelog --- git-remote-hg-0.4/debian/changelog 2018-09-29 16:04:23.000000000 +0000 +++ git-remote-hg-1.0.0~ds/debian/changelog 2019-02-09 18:42:14.000000000 +0000 @@ -1,3 +1,52 @@ +git-remote-hg (1.0.0~ds-1) unstable; urgency=medium + + [ upstream ] + * New release. + + Fixes to support Mercurial 4.7. + Closes: Bug#915426. Thanks to Paul Gevers. + + [ Ondřej Nový ] + * Update copyright info: Use https protocol in Format field + * Use package section optional (not obsolete extra). + * Update Vcs-* fields: Packaging moved to salsa.debian.org. + + [ Jonas Smedegaard ] + * Take over as maintainer (see bug#915426). + Thanks for your past contributions, Jonathan, + and feel free to join as co-maintainer. + * Update watch file: + + Bump to file format 4. + + Rewrite usage comment. + + Use substitution strings. + + Use ~ds suffix for repackaged upstream source. + * Add git-buildpackage config: + + Enable pristine-tar and signed tags. + + Filter any .git* file. + * Relax to build-depend unversioned on debhelper: + Needed version satisfied even in oldstable. + * Add maintainer script to source check copyright. + * Declare compliance with Debian Policy 4.3.0. + * Set Rules-Requires-Root: no. + * Update copyright info: + + Fix double-whitespace-delimit copyright holders. + + Use recommended license shortname. + + Use License-Grant and License-Reference fields. + Thanks to Ben Finney. + + Add myself as copyright holder. + + Tighten packaging license to GPL-3+. + + Repackage upstream source, + excluding convenience code copy of sharness. + + Drop Files section for sharness, + now excluded in repackaged source. + + Fix use License GPL-2 (not GPL-2+) for upstream code. + * Add lintian overrides regarding License-Reference. + * Drop patches cherry-picked upstream now applied. + * Add patch 2002 to use shared sharness TAP library. + Build-depend on sharness. + * Add patch 2003 to skip a failing test. + + -- Jonas Smedegaard Sat, 09 Feb 2019 19:42:14 +0100 + git-remote-hg (0.4-0.1) unstable; urgency=medium * Non-maintainer upload. @@ -39,7 +88,7 @@ - Drop Mercurial 3.2 patch; applied upstream * Switch upstream to Max Horn's fork (fingolfin/git-remote-hg) as original repo (felipec/git-remote-hg) appears unmaintained - * Add DEP-3 headers to mercurial_3.2_support.patch + * Add DEP-3 headers to mercurial_3.2_support.patch * d/control: various fixes found by libconfig-model-dpkg-perl * d/control: Update Homepage, Vcs-{Browser,Git} URLs diff -Nru git-remote-hg-0.4/debian/control git-remote-hg-1.0.0~ds/debian/control --- git-remote-hg-0.4/debian/control 2018-09-29 15:10:24.000000000 +0000 +++ git-remote-hg-1.0.0~ds/debian/control 2019-02-09 17:54:43.000000000 +0000 @@ -1,29 +1,33 @@ Source: git-remote-hg -Maintainer: Jonathan McCrohan -Uploaders: Jonathan Nieder +Maintainer: Jonas Smedegaard Section: vcs -Priority: extra -Build-Depends: debhelper (>= 9) -Build-Depends-Indep: asciidoc, - xmlto, - mercurial, - git, - python -# Needed for the testsuite -Standards-Version: 3.9.8 -Vcs-Browser: https://anonscm.debian.org/git/collab-maint/git-remote-hg.git -Vcs-Git: https://anonscm.debian.org/git/collab-maint/git-remote-hg.git +Priority: optional +Build-Depends: + debhelper, +Build-Depends-Indep: + asciidoc, + git, + mercurial, + python, + sharness, + xmlto, +Standards-Version: 4.3.0 +Vcs-Browser: https://salsa.debian.org/debian/git-remote-hg +Vcs-Git: https://salsa.debian.org/debian/git-remote-hg.git Homepage: https://github.com/fingolfin/git-remote-hg +Rules-Requires-Root: no Package: git-remote-hg Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends}, - git, - python, - mercurial -Suggests: git-doc +Depends: + git, + mercurial, + python, + ${misc:Depends}, +Suggests: + git-doc, Description: bidirectional bridge between Git and Mercurial - This package provides the hg remote helper, which allows Git to - read from and write to Mercurial repositories as though they were remote - Git repositories. + This package provides the hg remote helper, + which allows Git to read from and write to Mercurial repositories + as though they were remote Git repositories. diff -Nru git-remote-hg-0.4/debian/copyright git-remote-hg-1.0.0~ds/debian/copyright --- git-remote-hg-0.4/debian/copyright 2018-09-29 15:33:06.000000000 +0000 +++ git-remote-hg-1.0.0~ds/debian/copyright 2019-02-09 18:09:07.000000000 +0000 @@ -1,38 +1,35 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: git-remote-hg Upstream-Contact: https://github.com/mnauw/git-remote-hg/issues Source: https://github.com/mnauw/git-remote-hg + Repackaged, excluding convenience code copies. +Files-Excluded: + test/sharness.sh Files: * -Copyright: 2012-2014 Felipe Contreras - 2016 Mark Nauwelaerts -License: GPL-2.0+ - -Files: test/sharness.sh -Copyright: 2005-2012 Junio C Hamano - 2011-2012 Mathias Lafeldt - 2005-2012 Git project -License: GPL-2.0+ +Copyright: + 2012-2014, Felipe Contreras + 2016, Mark Nauwelaerts +License-Grant: + license = GPLv2 +License: GPL-2 Files: debian/* -Copyright: 2014 Sven Joachim - 2014 Vagrant Cascadian - 2014 Jonathan McCrohan -License: GPL-2.0+ +Copyright: + 2014, Jonathan McCrohan + 2014, Sven Joachim + 2014, Vagrant Cascadian + 2016-2019, Jonas Smedegaard +License-Grant: + This package is free software; + you can redistribute it and/or modify it + under the terms of the GNU General Public License + as published by the Free Software Foundation; + either version 3 of the License, or (at your option) any later version. +License: GPL-3+ + +License: GPL-2 +License-Reference: /usr/share/common-licenses/GPL-2 -License: GPL-2.0+ - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see - . - On Debian systems, the complete text of the GNU General - Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". +License: GPL-3+ +License-Reference: /usr/share/common-licenses/GPL-3 diff -Nru git-remote-hg-0.4/debian/copyright-check git-remote-hg-1.0.0~ds/debian/copyright-check --- git-remote-hg-0.4/debian/copyright-check 1970-01-01 00:00:00.000000000 +0000 +++ git-remote-hg-1.0.0~ds/debian/copyright-check 2019-02-04 01:46:59.000000000 +0000 @@ -0,0 +1,29 @@ +#!/bin/sh +# Copyright 2016-2019, Jonas Smedegaard +# Description: helper script to update copyright_hints +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +set -eu + +# extract metadata from graphics files before copyright check +# - and skip data files unlikely to contain copyright/licensing info. +export DEB_COPYRIGHT_EXTRACT_EXTS="gif jpg png" +export DEB_COPYRIGHT_CHECK_IGNORE_EXTS="epgz ico" + +make -f /usr/share/cdbs/1/rules/utils.mk pre-build || true +make -f /usr/share/cdbs/1/rules/utils.mk clean DEB_COPYRIGHT_CHECK_STRICT=1 + +# unconditionally merge changes - safe to do with git-tracked package +[ ! -f debian/copyright_newhints ] || mv -f debian/copyright_newhints debian/copyright_hints diff -Nru git-remote-hg-0.4/debian/copyright_hints git-remote-hg-1.0.0~ds/debian/copyright_hints --- git-remote-hg-0.4/debian/copyright_hints 1970-01-01 00:00:00.000000000 +0000 +++ git-remote-hg-1.0.0~ds/debian/copyright_hints 2019-02-09 18:18:41.000000000 +0000 @@ -0,0 +1,82 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: FIXME +Upstream-Contact: FIXME +Source: FIXME +Disclaimer: Autogenerated by CDBS + +Files: Makefile + README.asciidoc + debian/compat + debian/control + debian/gbp.conf + debian/git-remote-hg.docs + debian/patches/2002_testsuite_shared_sharness.patch + debian/patches/series + debian/patches/testsuite_UTF-8.patch + debian/rules + debian/source/format + debian/tests/control + debian/tests/upstream-test-suite + debian/watch + doc/SubmittingPatches + doc/git-remote-hg.txt + setup.py + test/Makefile + test/main-push.t + test/test-lib.sh +Copyright: NONE +License: UNKNOWN + FIXME + +Files: debian/patches/debian-shebang.diff + git-remote-hg +Copyright: 2012, Felipe Contreras + 2016, Mark Nauwelaerts +License: UNKNOWN + FIXME + +Files: test/bidi.t + test/hg-git.t +Copyright: 2012, Felipe Contreras + ltà + st èncödîng" && +License: UNKNOWN + FIXME + +Files: git-hg-helper + test/helper.t +Copyright: 2016, Mark Nauwelaerts +License: UNKNOWN + FIXME + +Files: LICENSE +Copyright: 1989, 1991, Free Software Foundation, Inc., + + disclaimer" for the program, if + ed by the Free + ed interfaces, the + interest in the program + the software, and + year name of author +License: GPL-2+ + FIXME + +Files: debian/copyright-check +Copyright: 2016-2019, Jonas Smedegaard + check +License: GPL-3+ + FIXME + +Files: test/main.t +Copyright: 2012, Felipe Contreras +License: UNKNOWN + FIXME + +Files: debian/source/lintian-overrides +Copyright: GPL-2 + GPL-3+ + gpl-2 + gpl-3+ +License: UNKNOWN + FIXME + diff -Nru git-remote-hg-0.4/debian/gbp.conf git-remote-hg-1.0.0~ds/debian/gbp.conf --- git-remote-hg-0.4/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ git-remote-hg-1.0.0~ds/debian/gbp.conf 2019-02-09 17:18:47.000000000 +0000 @@ -0,0 +1,6 @@ +# Configuration file for git-buildpackage and friends + +[DEFAULT] +pristine-tar = True +sign-tags = True +filter = */.git* diff -Nru git-remote-hg-0.4/debian/patches/020180909~435373e.patch git-remote-hg-1.0.0~ds/debian/patches/020180909~435373e.patch --- git-remote-hg-0.4/debian/patches/020180909~435373e.patch 2018-09-29 15:48:59.000000000 +0000 +++ git-remote-hg-1.0.0~ds/debian/patches/020180909~435373e.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -Description: Adjust to Mercurial 4.7 wrt more restricted changectx API -Author: Mark Nauwelaerts -Origin: upstream, https://github.com/mnauw/git-remote-hg/commit/435373e -Bug: https://github.com/mnauw/git-remote-hg/issues/18 -Forwarded: yes -Last-Update: 2018-09-29 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/git-remote-hg -+++ b/git-remote-hg -@@ -14,7 +14,7 @@ - # "$GIT_DIR/hg/origin/clone/.hg/". - - from mercurial import hg, ui, bookmarks, context, encoding --from mercurial import node, error, extensions, discovery, util -+from mercurial import node, error, extensions, discovery, util, scmutil - from mercurial import changegroup - - import re -@@ -629,7 +629,7 @@ - notes.update(pending_revs) - - def export_tag(repo, tag): -- export_ref(repo, tag, 'tags', repo[hgref(tag)]) -+ export_ref(repo, tag, 'tags', scmutil.revsingle(repo, hgref(tag))) - - def export_bookmark(repo, bmark): - head = bmarks[hgref(bmark)] diff -Nru git-remote-hg-0.4/debian/patches/020180909~5ddcdd3.patch git-remote-hg-1.0.0~ds/debian/patches/020180909~5ddcdd3.patch --- git-remote-hg-0.4/debian/patches/020180909~5ddcdd3.patch 2018-09-29 15:49:00.000000000 +0000 +++ git-remote-hg-1.0.0~ds/debian/patches/020180909~5ddcdd3.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -Description: Adjust to Mercurial 4.7 wrt deprecated revlog method -Author: Mark Nauwelaerts -Origin: upstream, https://github.com/mnauw/git-remote-hg/commit/5ddcdd3 -Forwarded: yes -Last-Update: 2018-09-29 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/git-remote-hg -+++ b/git-remote-hg -@@ -1121,7 +1121,10 @@ - print "error %s unknown" % ref - return False - -- if not repo.changelog.descendant(ctx_old.rev(), ctx_new.rev()): -+ # replaced around Mercurial 4.7 -+ isancestor = repo.changelog.isancestorrev if hasattr(repo.changelog, 'isancestorrev') \ -+ else repo.changelog.descendant -+ if not isancestor(ctx_old.rev(), ctx_new.rev()): - if force: - print "ok %s forced update" % ref - else: diff -Nru git-remote-hg-0.4/debian/patches/2002_testsuite_shared_sharness.patch git-remote-hg-1.0.0~ds/debian/patches/2002_testsuite_shared_sharness.patch --- git-remote-hg-0.4/debian/patches/2002_testsuite_shared_sharness.patch 1970-01-01 00:00:00.000000000 +0000 +++ git-remote-hg-1.0.0~ds/debian/patches/2002_testsuite_shared_sharness.patch 2019-02-09 18:17:46.000000000 +0000 @@ -0,0 +1,15 @@ +Description: Use shared sharness TAP library +Author: Jonas Smedegaard +Last-Update: 2019-02-09 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/test/test-lib.sh ++++ b/test/test-lib.sh +@@ -1,6 +1,6 @@ + #!/bin/sh + +-. ./sharness.sh ++. /usr/share/sharness/sharness.sh + + test_set_prereq PYTHON + diff -Nru git-remote-hg-0.4/debian/patches/2003_testsuite_skip_broken.patch git-remote-hg-1.0.0~ds/debian/patches/2003_testsuite_skip_broken.patch --- git-remote-hg-0.4/debian/patches/2003_testsuite_skip_broken.patch 1970-01-01 00:00:00.000000000 +0000 +++ git-remote-hg-1.0.0~ds/debian/patches/2003_testsuite_skip_broken.patch 2019-02-09 18:36:49.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Skip broken test +Author: Jonas Smedegaard +Last-Update: 2019-02-09 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/test/main.t ++++ b/test/main.t +@@ -1036,7 +1036,7 @@ + check_bookmark hgrepo feature-a two + ' + +-test_expect_success 'pull tags' ' ++test_expect_failure 'pull tags' ' + test_when_finished "rm -rf hgrepo gitrepo" && + + ( diff -Nru git-remote-hg-0.4/debian/patches/series git-remote-hg-1.0.0~ds/debian/patches/series --- git-remote-hg-0.4/debian/patches/series 2018-09-29 16:02:19.000000000 +0000 +++ git-remote-hg-1.0.0~ds/debian/patches/series 2019-02-09 18:34:51.000000000 +0000 @@ -1,4 +1,4 @@ -020180909~435373e.patch -020180909~5ddcdd3.patch debian-shebang.diff testsuite_UTF-8.patch +2002_testsuite_shared_sharness.patch +2003_testsuite_skip_broken.patch diff -Nru git-remote-hg-0.4/debian/rules git-remote-hg-1.0.0~ds/debian/rules --- git-remote-hg-0.4/debian/rules 2018-09-29 15:10:24.000000000 +0000 +++ git-remote-hg-1.0.0~ds/debian/rules 2019-02-09 17:05:24.000000000 +0000 @@ -4,4 +4,4 @@ dh_auto_install -- prefix=/usr DESTDIR=debian/git-remote-hg install-doc %: - dh $@ + dh $@ diff -Nru git-remote-hg-0.4/debian/source/lintian-overrides git-remote-hg-1.0.0~ds/debian/source/lintian-overrides --- git-remote-hg-0.4/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ git-remote-hg-1.0.0~ds/debian/source/lintian-overrides 2019-02-09 18:10:07.000000000 +0000 @@ -0,0 +1,5 @@ +# License is in License-Reference field (see bug#786450) +missing-license-paragraph-in-dep5-copyright gpl-2 * +missing-license-paragraph-in-dep5-copyright gpl-3\+ * +missing-license-text-in-dep5-copyright GPL-2 * +missing-license-text-in-dep5-copyright GPL-3\+ * diff -Nru git-remote-hg-0.4/debian/tests/control git-remote-hg-1.0.0~ds/debian/tests/control --- git-remote-hg-0.4/debian/tests/control 2018-09-29 15:10:24.000000000 +0000 +++ git-remote-hg-1.0.0~ds/debian/tests/control 2019-02-09 17:10:24.000000000 +0000 @@ -1,2 +1,3 @@ Tests: upstream-test-suite -Depends: @builddeps@ +Depends: + @builddeps@, diff -Nru git-remote-hg-0.4/debian/watch git-remote-hg-1.0.0~ds/debian/watch --- git-remote-hg-0.4/debian/watch 2018-09-29 15:11:33.000000000 +0000 +++ git-remote-hg-1.0.0~ds/debian/watch 2019-02-09 17:51:16.000000000 +0000 @@ -1,3 +1,9 @@ -version=3 -opts="filenamemangle=s/(?:.*\/)?v?(\d[\d\.]*)\.tar\.gz/git-remote-hg-$1.tar.gz/" \ - https://github.com/mnauw/git-remote-hg/tags (?:.*/)?v?(\d[\d\.]*)\.tar\.gz +version=4 +# check: uscan --report +# update: gbp import-orig --upstream-vcs-tag=vX.Y.Z --uscan + +opts=\ +dversionmangle=s/[~+](dfsg|ds)\d*$//,repacksuffix=~ds,\ +filenamemangle=s%(?:.*?)?v?(@ANY_VERSION@@ARCHIVE_EXT@)%@PACKAGE@-$1% \ +https://github.com/mnauw/git-remote-hg/tags \ +(?:.*?/)?v?@ANY_VERSION@@ARCHIVE_EXT@ diff -Nru git-remote-hg-0.4/git-remote-hg git-remote-hg-1.0.0~ds/git-remote-hg --- git-remote-hg-0.4/git-remote-hg 2018-05-14 19:40:37.000000000 +0000 +++ git-remote-hg-1.0.0~ds/git-remote-hg 2018-10-14 14:27:51.000000000 +0000 @@ -14,7 +14,7 @@ # "$GIT_DIR/hg/origin/clone/.hg/". from mercurial import hg, ui, bookmarks, context, encoding -from mercurial import node, error, extensions, discovery, util +from mercurial import node, error, extensions, discovery, util, scmutil from mercurial import changegroup import re @@ -629,7 +629,7 @@ notes.update(pending_revs) def export_tag(repo, tag): - export_ref(repo, tag, 'tags', repo[hgref(tag)]) + export_ref(repo, tag, 'tags', scmutil.revsingle(repo, hgref(tag))) def export_bookmark(repo, bmark): head = bmarks[hgref(bmark)] @@ -1121,7 +1121,10 @@ print "error %s unknown" % ref return False - if not repo.changelog.descendant(ctx_old.rev(), ctx_new.rev()): + # replaced around Mercurial 4.7 + isancestor = repo.changelog.isancestorrev if hasattr(repo.changelog, 'isancestorrev') \ + else repo.changelog.descendant + if not isancestor(ctx_old.rev(), ctx_new.rev()): if force: print "ok %s forced update" % ref else: diff -Nru git-remote-hg-0.4/Makefile git-remote-hg-1.0.0~ds/Makefile --- git-remote-hg-0.4/Makefile 2018-05-14 19:40:37.000000000 +0000 +++ git-remote-hg-1.0.0~ds/Makefile 2018-10-14 14:27:51.000000000 +0000 @@ -26,4 +26,14 @@ install -d -m 755 $(D)$(mandir)/ install -m 644 doc/git-remote-hg.1 $(D)$(mandir)/git-remote-hg.1 -.PHONY: all test install install-doc clean +pypi: + -rm -rf dist build + python setup.py sdist bdist_wheel + +pypi-upload: + twine upload dist/* + +pypi-test: + twine upload --repository-url https://test.pypi.org/legacy/ dist/* + +.PHONY: all test install install-doc clean pypy pypy-upload diff -Nru git-remote-hg-0.4/setup.py git-remote-hg-1.0.0~ds/setup.py --- git-remote-hg-0.4/setup.py 1970-01-01 00:00:00.000000000 +0000 +++ git-remote-hg-1.0.0~ds/setup.py 2018-10-14 14:27:51.000000000 +0000 @@ -0,0 +1,53 @@ +# git-remote-hg setuptools script + +import setuptools +import subprocess +import sys +import os + +# derive version from git repo +cmd = ["git", "describe", "--tags"] +commit = os.environ.get('REV', None) +if commit: + cmd.append(commit) +process = subprocess.Popen(cmd, stdout=subprocess.PIPE) +version = process.communicate()[0].strip() +# strip leading v +version = version[1:] + +# check for released version +assert (len(version) > 0) +assert (version.find('-') < 0) + +long_description = \ +""" +'git-remote-hg' is a gitremote protocol helper for Mercurial. +It allows you to clone, fetch and push to and from Mercurial repositories as if +they were Git ones using a hg::some-url URL. + +See the homepage for much more explanation. +""" + +CLASSIFIERS = [ + "Programming Language :: Python", + "Programming Language :: Python :: 2", + "Programming Language :: Python :: 2.7", + "License :: OSI Approved", + "License :: OSI Approved :: GNU General Public License v2 (GPLv2)", + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", +] + +setuptools.setup(name="git-remote-hg", + version=version, + author="Mark Nauwelaerts", + author_email="mnauw@users.sourceforge.net", + url="http://github.com/mnauw/git-remote-hg", + description="access hg repositories as git remotes", + long_description=long_description, + license="GPLv2", + keywords="git hg mercurial", + scripts=["git-remote-hg", "git-hg-helper"], + classifiers=CLASSIFIERS + ) + diff -Nru git-remote-hg-0.4/test/sharness.sh git-remote-hg-1.0.0~ds/test/sharness.sh --- git-remote-hg-0.4/test/sharness.sh 2018-05-14 19:40:37.000000000 +0000 +++ git-remote-hg-1.0.0~ds/test/sharness.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,711 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2011-2012 Mathias Lafeldt -# Copyright (c) 2005-2012 Git project -# Copyright (c) 2005-2012 Junio C Hamano -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see http://www.gnu.org/licenses/ . - -# Public: Current version of Sharness. -SHARNESS_VERSION="0.3.0" -export SHARNESS_VERSION - -# Public: The file extension for tests. By default, it is set to "t". -: ${SHARNESS_TEST_EXTENSION:=t} -export SHARNESS_TEST_EXTENSION - -# Keep the original TERM for say_color -ORIGINAL_TERM=$TERM - -# For repeatability, reset the environment to a known state. -LANG=C -LC_ALL=C -PAGER=cat -TZ=UTC -TERM=dumb -EDITOR=: -export LANG LC_ALL PAGER TZ TERM EDITOR -unset VISUAL CDPATH GREP_OPTIONS - -# Line feed -LF=' -' - -[ "x$ORIGINAL_TERM" != "xdumb" ] && ( - TERM=$ORIGINAL_TERM && - export TERM && - [ -t 1 ] && - tput bold >/dev/null 2>&1 && - tput setaf 1 >/dev/null 2>&1 && - tput sgr0 >/dev/null 2>&1 - ) && - color=t - -while test "$#" -ne 0; do - case "$1" in - -d|--d|--de|--deb|--debu|--debug) - debug=t; shift ;; - -i|--i|--im|--imm|--imme|--immed|--immedi|--immedia|--immediat|--immediate) - immediate=t; shift ;; - -l|--l|--lo|--lon|--long|--long-|--long-t|--long-te|--long-tes|--long-test|--long-tests) - TEST_LONG=t; export TEST_LONG; shift ;; - -h|--h|--he|--hel|--help) - help=t; shift ;; - -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose) - verbose=t; shift ;; - -q|--q|--qu|--qui|--quie|--quiet) - # Ignore --quiet under a TAP::Harness. Saying how many tests - # passed without the ok/not ok details is always an error. - test -z "$HARNESS_ACTIVE" && quiet=t; shift ;; - --no-color) - color=; shift ;; - --root=*) - root=$(expr "z$1" : 'z[^=]*=\(.*\)') - shift ;; - *) - echo "error: unknown test option '$1'" >&2; exit 1 ;; - esac -done - -if test -n "$color"; then - say_color() { - ( - TERM=$ORIGINAL_TERM - export TERM - case "$1" in - error) - tput bold; tput setaf 1;; # bold red - skip) - tput setaf 4;; # blue - warn) - tput setaf 3;; # brown/yellow - pass) - tput setaf 2;; # green - info) - tput setaf 6;; # cyan - *) - test -n "$quiet" && return;; - esac - shift - printf "%s" "$*" - tput sgr0 - echo - ) - } -else - say_color() { - test -z "$1" && test -n "$quiet" && return - shift - printf "%s\n" "$*" - } -fi - -error() { - say_color error "error: $*" - EXIT_OK=t - exit 1 -} - -say() { - say_color info "$*" -} - -test -n "$test_description" || error "Test script did not set test_description." - -if test "$help" = "t"; then - echo "$test_description" - exit 0 -fi - -exec 5>&1 -exec 6<&0 -if test "$verbose" = "t"; then - exec 4>&2 3>&1 -else - exec 4>/dev/null 3>/dev/null -fi - -test_failure=0 -test_count=0 -test_fixed=0 -test_broken=0 -test_success=0 - -die() { - code=$? - if test -n "$EXIT_OK"; then - exit $code - else - echo >&5 "FATAL: Unexpected exit with code $code" - exit 1 - fi -} - -EXIT_OK= -trap 'die' EXIT - -# Public: Define that a test prerequisite is available. -# -# The prerequisite can later be checked explicitly using test_have_prereq or -# implicitly by specifying the prerequisite name in calls to test_expect_success -# or test_expect_failure. -# -# $1 - Name of prerequiste (a simple word, in all capital letters by convention) -# -# Examples -# -# # Set PYTHON prerequisite if interpreter is available. -# command -v python >/dev/null && test_set_prereq PYTHON -# -# # Set prerequisite depending on some variable. -# test -z "$NO_GETTEXT" && test_set_prereq GETTEXT -# -# Returns nothing. -test_set_prereq() { - satisfied_prereq="$satisfied_prereq$1 " -} -satisfied_prereq=" " - -# Public: Check if one or more test prerequisites are defined. -# -# The prerequisites must have previously been set with test_set_prereq. -# The most common use of this is to skip all the tests if some essential -# prerequisite is missing. -# -# $1 - Comma-separated list of test prerequisites. -# -# Examples -# -# # Skip all remaining tests if prerequisite is not set. -# if ! test_have_prereq PERL; then -# skip_all='skipping perl interface tests, perl not available' -# test_done -# fi -# -# Returns 0 if all prerequisites are defined or 1 otherwise. -test_have_prereq() { - # prerequisites can be concatenated with ',' - save_IFS=$IFS - IFS=, - set -- $* - IFS=$save_IFS - - total_prereq=0 - ok_prereq=0 - missing_prereq= - - for prerequisite; do - case "$prerequisite" in - !*) - negative_prereq=t - prerequisite=${prerequisite#!} - ;; - *) - negative_prereq= - esac - - total_prereq=$(($total_prereq + 1)) - case "$satisfied_prereq" in - *" $prerequisite "*) - satisfied_this_prereq=t - ;; - *) - satisfied_this_prereq= - esac - - case "$satisfied_this_prereq,$negative_prereq" in - t,|,t) - ok_prereq=$(($ok_prereq + 1)) - ;; - *) - # Keep a list of missing prerequisites; restore - # the negative marker if necessary. - prerequisite=${negative_prereq:+!}$prerequisite - if test -z "$missing_prereq"; then - missing_prereq=$prerequisite - else - missing_prereq="$prerequisite,$missing_prereq" - fi - esac - done - - test $total_prereq = $ok_prereq -} - -# You are not expected to call test_ok_ and test_failure_ directly, use -# the text_expect_* functions instead. - -test_ok_() { - test_success=$(($test_success + 1)) - say_color "" "ok $test_count - $@" -} - -test_failure_() { - test_failure=$(($test_failure + 1)) - say_color error "not ok $test_count - $1" - shift - echo "$@" | sed -e 's/^/# /' - test "$immediate" = "" || { EXIT_OK=t; exit 1; } -} - -test_known_broken_ok_() { - test_fixed=$(($test_fixed + 1)) - say_color error "ok $test_count - $@ # TODO known breakage vanished" -} - -test_known_broken_failure_() { - test_broken=$(($test_broken + 1)) - say_color warn "not ok $test_count - $@ # TODO known breakage" -} - -# Public: Execute commands in debug mode. -# -# Takes a single argument and evaluates it only when the test script is started -# with --debug. This is primarily meant for use during the development of test -# scripts. -# -# $1 - Commands to be executed. -# -# Examples -# -# test_debug "cat some_log_file" -# -# Returns the exit code of the last command executed in debug mode or 0 -# otherwise. -test_debug() { - test "$debug" = "" || eval "$1" -} - -test_eval_() { - # This is a separate function because some tests use - # "return" to end a test_expect_success block early. - eval &3 2>&4 "$*" -} - -test_run_() { - test_cleanup=: - expecting_failure=$2 - test_eval_ "$1" - eval_ret=$? - - if test -z "$immediate" || test $eval_ret = 0 || test -n "$expecting_failure"; then - test_eval_ "$test_cleanup" - fi - if test "$verbose" = "t" && test -n "$HARNESS_ACTIVE"; then - echo "" - fi - return "$eval_ret" -} - -test_skip_() { - test_count=$(($test_count + 1)) - to_skip= - for skp in $SKIP_TESTS; do - case $this_test.$test_count in - $skp) - to_skip=t - break - esac - done - if test -z "$to_skip" && test -n "$test_prereq" && ! test_have_prereq "$test_prereq"; then - to_skip=t - fi - case "$to_skip" in - t) - of_prereq= - if test "$missing_prereq" != "$test_prereq"; then - of_prereq=" of $test_prereq" - fi - - say_color skip >&3 "skipping test: $@" - say_color skip "ok $test_count # skip $1 (missing $missing_prereq${of_prereq})" - : true - ;; - *) - false - ;; - esac -} - -# Public: Run test commands and expect them to succeed. -# -# When the test passed, an "ok" message is printed and the number of successful -# tests is incremented. When it failed, a "not ok" message is printed and the -# number of failed tests is incremented. -# -# With --immediate, exit test immediately upon the first failed test. -# -# Usually takes two arguments: -# $1 - Test description -# $2 - Commands to be executed. -# -# With three arguments, the first will be taken to be a prerequisite: -# $1 - Comma-separated list of test prerequisites. The test will be skipped if -# not all of the given prerequisites are set. To negate a prerequisite, -# put a "!" in front of it. -# $2 - Test description -# $3 - Commands to be executed. -# -# Examples -# -# test_expect_success \ -# 'git-write-tree should be able to write an empty tree.' \ -# 'tree=$(git-write-tree)' -# -# # Test depending on one prerequisite. -# test_expect_success TTY 'git --paginate rev-list uses a pager' \ -# ' ... ' -# -# # Multiple prerequisites are separated by a comma. -# test_expect_success PERL,PYTHON 'yo dawg' \ -# ' test $(perl -E 'print eval "1 +" . qx[python -c "print 2"]') == "4" ' -# -# Returns nothing. -test_expect_success() { - test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq= - test "$#" = 2 || error "bug in the test script: not 2 or 3 parameters to test_expect_success" - export test_prereq - if ! test_skip_ "$@"; then - say >&3 "expecting success: $2" - if test_run_ "$2"; then - test_ok_ "$1" - else - test_failure_ "$@" - fi - fi - echo >&3 "" -} - -# Public: Run test commands and expect them to fail. Used to demonstrate a known -# breakage. -# -# This is NOT the opposite of test_expect_success, but rather used to mark a -# test that demonstrates a known breakage. -# -# When the test passed, an "ok" message is printed and the number of fixed tests -# is incremented. When it failed, a "not ok" message is printed and the number -# of tests still broken is incremented. -# -# Failures from these tests won't cause --immediate to stop. -# -# Usually takes two arguments: -# $1 - Test description -# $2 - Commands to be executed. -# -# With three arguments, the first will be taken to be a prerequisite: -# $1 - Comma-separated list of test prerequisites. The test will be skipped if -# not all of the given prerequisites are set. To negate a prerequisite, -# put a "!" in front of it. -# $2 - Test description -# $3 - Commands to be executed. -# -# Returns nothing. -test_expect_failure() { - test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq= - test "$#" = 2 || error "bug in the test script: not 2 or 3 parameters to test_expect_failure" - export test_prereq - if ! test_skip_ "$@"; then - say >&3 "checking known breakage: $2" - if test_run_ "$2" expecting_failure; then - test_known_broken_ok_ "$1" - else - test_known_broken_failure_ "$1" - fi - fi - echo >&3 "" -} - -# Public: Run command and ensure that it fails in a controlled way. -# -# Use it instead of "! ". For example, when dies due to a -# segfault, test_must_fail diagnoses it as an error, while "! " would -# mistakenly be treated as just another expected failure. -# -# This is one of the prefix functions to be used inside test_expect_success or -# test_expect_failure. -# -# $1.. - Command to be executed. -# -# Examples -# -# test_expect_success 'complain and die' ' -# do something && -# do something else && -# test_must_fail git checkout ../outerspace -# ' -# -# Returns 1 if the command succeeded (exit code 0). -# Returns 1 if the command died by signal (exit codes 130-192) -# Returns 1 if the command could not be found (exit code 127). -# Returns 0 otherwise. -test_must_fail() { - "$@" - exit_code=$? - if test $exit_code = 0; then - echo >&2 "test_must_fail: command succeeded: $*" - return 1 - elif test $exit_code -gt 129 -a $exit_code -le 192; then - echo >&2 "test_must_fail: died by signal: $*" - return 1 - elif test $exit_code = 127; then - echo >&2 "test_must_fail: command not found: $*" - return 1 - fi - return 0 -} - -# Public: Run command and ensure that it succeeds or fails in a controlled way. -# -# Similar to test_must_fail, but tolerates success too. Use it instead of -# " || :" to catch failures caused by a segfault, for instance. -# -# This is one of the prefix functions to be used inside test_expect_success or -# test_expect_failure. -# -# $1.. - Command to be executed. -# -# Examples -# -# test_expect_success 'some command works without configuration' ' -# test_might_fail git config --unset all.configuration && -# do something -# ' -# -# Returns 1 if the command died by signal (exit codes 130-192) -# Returns 1 if the command could not be found (exit code 127). -# Returns 0 otherwise. -test_might_fail() { - "$@" - exit_code=$? - if test $exit_code -gt 129 -a $exit_code -le 192; then - echo >&2 "test_might_fail: died by signal: $*" - return 1 - elif test $exit_code = 127; then - echo >&2 "test_might_fail: command not found: $*" - return 1 - fi - return 0 -} - -# Public: Run command and ensure it exits with a given exit code. -# -# This is one of the prefix functions to be used inside test_expect_success or -# test_expect_failure. -# -# $1 - Expected exit code. -# $2.. - Command to be executed. -# -# Examples -# -# test_expect_success 'Merge with d/f conflicts' ' -# test_expect_code 1 git merge "merge msg" B master -# ' -# -# Returns 0 if the expected exit code is returned or 1 otherwise. -test_expect_code() { - want_code=$1 - shift - "$@" - exit_code=$? - if test $exit_code = $want_code; then - return 0 - fi - - echo >&2 "test_expect_code: command exited with $exit_code, we wanted $want_code $*" - return 1 -} - -# Public: Compare two files to see if expected output matches actual output. -# -# The TEST_CMP variable defines the command used for the comparision; it -# defaults to "diff -u". Only when the test script was started with --verbose, -# will the command's output, the diff, be printed to the standard output. -# -# This is one of the prefix functions to be used inside test_expect_success or -# test_expect_failure. -# -# $1 - Path to file with expected output. -# $2 - Path to file with actual output. -# -# Examples -# -# test_expect_success 'foo works' ' -# echo expected >expected && -# foo >actual && -# test_cmp expected actual -# ' -# -# Returns the exit code of the command set by TEST_CMP. -test_cmp() { - ${TEST_CMP:-diff -u} "$@" -} - -# Public: Schedule cleanup commands to be run unconditionally at the end of a -# test. -# -# If some cleanup command fails, the test will not pass. With --immediate, no -# cleanup is done to help diagnose what went wrong. -# -# This is one of the prefix functions to be used inside test_expect_success or -# test_expect_failure. -# -# $1.. - Commands to prepend to the list of cleanup commands. -# -# Examples -# -# test_expect_success 'test core.capslock' ' -# git config core.capslock true && -# test_when_finished "git config --unset core.capslock" && -# do_something -# ' -# -# Returns the exit code of the last cleanup command executed. -test_when_finished() { - test_cleanup="{ $* - } && (exit \"\$eval_ret\"); eval_ret=\$?; $test_cleanup" -} - -# Public: Summarize test results and exit with an appropriate error code. -# -# Must be called at the end of each test script. -# -# Can also be used to stop tests early and skip all remaining tests. For this, -# set skip_all to a string explaining why the tests were skipped before calling -# test_done. -# -# Examples -# -# # Each test script must call test_done at the end. -# test_done -# -# # Skip all remaining tests if prerequisite is not set. -# if ! test_have_prereq PERL; then -# skip_all='skipping perl interface tests, perl not available' -# test_done -# fi -# -# Returns 0 if all tests passed or 1 if there was a failure. -test_done() { - EXIT_OK=t - - if test -z "$HARNESS_ACTIVE"; then - test_results_dir="$SHARNESS_TEST_DIRECTORY/test-results" - mkdir -p "$test_results_dir" - test_results_path="$test_results_dir/${SHARNESS_TEST_FILE%.$SHARNESS_TEST_EXTENSION}.$$.counts" - - cat >>"$test_results_path" <<-EOF - total $test_count - success $test_success - fixed $test_fixed - broken $test_broken - failed $test_failure - - EOF - fi - - if test "$test_fixed" != 0; then - say_color error "# $test_fixed known breakage(s) vanished; please update test(s)" - fi - if test "$test_broken" != 0; then - say_color warn "# still have $test_broken known breakage(s)" - fi - if test "$test_broken" != 0 || test "$test_fixed" != 0; then - test_remaining=$(( $test_count - $test_broken - $test_fixed )) - msg="remaining $test_remaining test(s)" - else - test_remaining=$test_count - msg="$test_count test(s)" - fi - - case "$test_failure" in - 0) - # Maybe print SKIP message - if test -n "$skip_all" && test $test_count -gt 0; then - error "Can't use skip_all after running some tests" - fi - [ -z "$skip_all" ] || skip_all=" # SKIP $skip_all" - - if test $test_remaining -gt 0; then - say_color pass "# passed all $msg" - fi - say "1..$test_count$skip_all" - - test -d "$remove_trash" && - cd "$(dirname "$remove_trash")" && - rm -rf "$(basename "$remove_trash")" - - exit 0 ;; - - *) - say_color error "# failed $test_failure among $msg" - say "1..$test_count" - - exit 1 ;; - - esac -} - -# Public: Root directory containing tests. Tests can override this variable, -# e.g. for testing Sharness itself. -: ${SHARNESS_TEST_DIRECTORY:=$(pwd)} -export SHARNESS_TEST_DIRECTORY - -# Public: Build directory that will be added to PATH. By default, it is set to -# the parent directory of SHARNESS_TEST_DIRECTORY. -: ${SHARNESS_BUILD_DIRECTORY:="$SHARNESS_TEST_DIRECTORY/.."} -PATH="$SHARNESS_BUILD_DIRECTORY:$PATH" -export PATH SHARNESS_BUILD_DIRECTORY - -# Public: Path to test script currently executed. -SHARNESS_TEST_FILE="$0" -export SHARNESS_TEST_FILE - -# Prepare test area. -test_dir="trash directory.$(basename "$SHARNESS_TEST_FILE" ".$SHARNESS_TEST_EXTENSION")" -test -n "$root" && test_dir="$root/$test_dir" -case "$test_dir" in -/*) SHARNESS_TRASH_DIRECTORY="$test_dir" ;; - *) SHARNESS_TRASH_DIRECTORY="$SHARNESS_TEST_DIRECTORY/$test_dir" ;; -esac -test "$debug" = "t" || remove_trash="$SHARNESS_TRASH_DIRECTORY" -rm -rf "$test_dir" || { - EXIT_OK=t - echo >&5 "FATAL: Cannot prepare test area" - exit 1 -} - -# Public: Empty trash directory, the test area, provided for each test. The HOME -# variable is set to that directory too. -export SHARNESS_TRASH_DIRECTORY - -HOME="$SHARNESS_TRASH_DIRECTORY" -export HOME - -mkdir -p "$test_dir" || exit 1 -# Use -P to resolve symlinks in our working directory so that the cwd -# in subprocesses like git equals our $PWD (for pathname comparisons). -cd -P "$test_dir" || exit 1 - -this_test=${SHARNESS_TEST_FILE##*/} -this_test=${this_test%.$SHARNESS_TEST_EXTENSION} -for skp in $SKIP_TESTS; do - case "$this_test" in - $skp) - say_color info >&3 "skipping test $this_test altogether" - skip_all="skip all tests in $this_test" - test_done - esac -done - -# vi: set ts=4 sw=4 noet :