diff --git a/python-hglib-hg-52.patch b/python-hglib-hg-52.patch new file mode 100644 index 0000000..4907989 --- /dev/null +++ b/python-hglib-hg-52.patch @@ -0,0 +1,92 @@ +changeset: 211:1a318162f06f +user: Augie Fackler +date: Wed Dec 11 10:20:58 2019 -0500 +summary: grep: update tests to cope with behavior change in hg 5.2 + +diff -r 513ebe91dc72 -r 1a318162f06f tests/test-grep.py +--- a/tests/test-grep.py Wed Dec 11 09:39:53 2019 -0500 ++++ b/tests/test-grep.py Wed Dec 11 10:20:58 2019 -0500 +@@ -10,13 +10,22 @@ + # no match + self.assertEquals(list(self.client.grep(b('c'))), []) + +- self.assertEquals(list(self.client.grep(b('a'))), +- [(b('a'), b('0'), b('a')), (b('b'), b('0'), b('ab'))]) +- self.assertEquals(list(self.client.grep(b('a'), b('a'))), +- [(b('a'), b('0'), b('a'))]) ++ if self.client.version >= (5, 2): ++ self.assertEquals(list(self.client.grep(b('a'))), ++ [(b('a'), b('a'), b('b'))]) ++ self.assertEquals(list(self.client.grep(b('a'), b('a'))), ++ [(b('a'), b('a'), b(''))]) + +- self.assertEquals(list(self.client.grep(b('b'))), +- [(b('b'), b('0'), b('ab'))]) ++ self.assertEquals(list(self.client.grep(b('b'))), ++ [(b('b'), b('ab'), b(''))]) ++ else: ++ self.assertEquals(list(self.client.grep(b('a'))), ++ [(b('a'), b('0'), b('a')), (b('b'), b('0'), b('ab'))]) ++ self.assertEquals(list(self.client.grep(b('a'), b('a'))), ++ [(b('a'), b('0'), b('a'))]) ++ ++ self.assertEquals(list(self.client.grep(b('b'))), ++ [(b('b'), b('0'), b('ab'))]) + + def test_options(self): + self.append('a', 'a\n') +@@ -27,16 +36,26 @@ + (b('b'), b('0'), b('+'), b('ab'))], + list(self.client.grep(b('a'), all=True))) + +- self.assertEquals([(b('a'), b('0')), (b('b'), b('0'))], +- list(self.client.grep(b('a'), fileswithmatches=True))) ++ if self.client.version >= (5, 2): ++ self.assertEquals([(b('a'), b('b'))], ++ list(self.client.grep(b('a'), fileswithmatches=True))) ++ ++ self.assertEquals([(b('a'), b('1'), b('a'), b('b'))], ++ list(self.client.grep(b('a'), line=True))) + +- self.assertEquals([(b('a'), b('0'), b('1'), b('a')), +- (b('b'), b('0'), b('1'), b('ab'))], +- list(self.client.grep(b('a'), line=True))) ++ self.assertEquals([(b('a'), b('test'), b('a'), b('b'))], ++ list(self.client.grep(b('a'), user=True))) ++ else: ++ self.assertEquals([(b('a'), b('0')), (b('b'), b('0'))], ++ list(self.client.grep(b('a'), fileswithmatches=True))) + +- self.assertEquals([(b('a'), b('0'), b('test'), b('a')), +- (b('b'), b('0'), b('test'), b('ab'))], +- list(self.client.grep(b('a'), user=True))) ++ self.assertEquals([(b('a'), b('0'), b('1'), b('a')), ++ (b('b'), b('0'), b('1'), b('ab'))], ++ list(self.client.grep(b('a'), line=True))) ++ ++ self.assertEquals([(b('a'), b('0'), b('test'), b('a')), ++ (b('b'), b('0'), b('test'), b('ab'))], ++ list(self.client.grep(b('a'), user=True))) + + self.assertEquals([(b('a'), b('0'), b('1'), b('+'), b('test')), + (b('b'), b('0'), b('1'), b('+'), b('test'))], + +changeset: 208:12e6aaef0f6e +user: Matt Harbison +date: Tue May 07 22:16:59 2019 -0400 +summary: tests: handle the removal of `obsolete._enabled` in Mercurial + +diff -r 33b512aa8dba -r 12e6aaef0f6e tests/test-hidden.py +--- a/tests/test-hidden.py Mon Apr 30 10:38:03 2018 -0400 ++++ b/tests/test-hidden.py Tue May 07 22:16:59 2019 -0400 +@@ -22,6 +22,9 @@ + super(test_obsolete_baselib, self).setUp() + self.append('.hg/obs.py', + "import mercurial.obsolete\n" ++ "# 3.2 and later\n" ++ "mercurial.obsolete.isenabled = lambda r, opt: True\n" ++ "# Dropped in 5.1\n" + "mercurial.obsolete._enabled = True") + self.append('.hg/hgrc','\n[extensions]\nobs=.hg/obs.py') + + diff --git a/python-hglib.spec b/python-hglib.spec index 5cde9cc..2ad4e32 100644 --- a/python-hglib.spec +++ b/python-hglib.spec @@ -5,10 +5,11 @@ Summary: Mercurial Python library Name: python-hglib Version: 2.6.1 -Release: 9%{?dist} +Release: 10%{?dist} License: MIT URL: http://selenic.com/repo/python-hglib Source0: https://files.pythonhosted.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz +Patch0: python-hglib-hg-52.patch BuildArch: noarch BuildRequires: mercurial %if 0%{?with_python2} @@ -42,6 +43,7 @@ hg. %prep %setup -q +%patch0 -p1 %build %if 0%{?with_python2} @@ -74,6 +76,9 @@ hg. %{python3_sitelib}/python_hglib-*-py*egg-info %changelog +* Sat Feb 01 2020 Terje Rosten - 2.6.1-10 +- Add mercurial 5.2 compat patch + * Thu Jan 30 2020 Fedora Release Engineering - 2.6.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild