From 9c17af14f74224fa71b43666d848e514f28601d62ffd0d7f5f3aec24636e4069 Mon Sep 17 00:00:00 2001 From: Andrei Dziahel Date: Sun, 1 Dec 2024 09:12:31 +0000 Subject: [PATCH] - Update to version 11.1.6. * evolve: unrelated parts of splits are no longer considered content-divergent, this is a port of an upstream patch included in hg 6.8.2 * obshashrange: avoid executing too many DELETE requests at once * obshashrange: reset the cache if too many ranges need to be deleted topic (1.1.6) * stack: when stack base is obsolete, pick any successor, even if at random OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/mercurial-extension-hg-evolve?expand=0&rev=32 --- .gitattributes | 23 ++++ .gitignore | 1 + hg-evolve-11.1.2.tar.gz | 3 + hg-evolve-11.1.4.tar.gz | 3 + hg-evolve-11.1.5.tar.gz | 3 + hg-evolve-11.1.6.tar.gz | 3 + mercurial-extension-hg-evolve.changes | 189 ++++++++++++++++++++++++++ mercurial-extension-hg-evolve.spec | 81 +++++++++++ tests.blacklist | 6 + 9 files changed, 312 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 hg-evolve-11.1.2.tar.gz create mode 100644 hg-evolve-11.1.4.tar.gz create mode 100644 hg-evolve-11.1.5.tar.gz create mode 100644 hg-evolve-11.1.6.tar.gz create mode 100644 mercurial-extension-hg-evolve.changes create mode 100644 mercurial-extension-hg-evolve.spec create mode 100644 tests.blacklist diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/hg-evolve-11.1.2.tar.gz b/hg-evolve-11.1.2.tar.gz new file mode 100644 index 0000000..18c4f9d --- /dev/null +++ b/hg-evolve-11.1.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba0f93d6c45207e279172ab375347bc59b6fc9b85dcc165823b838ad7d780c7a +size 860623 diff --git a/hg-evolve-11.1.4.tar.gz b/hg-evolve-11.1.4.tar.gz new file mode 100644 index 0000000..fb2d962 --- /dev/null +++ b/hg-evolve-11.1.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:629876836e787d29cf55f8269267914aa966b147c780ffb0a8dd061cb215ff07 +size 861472 diff --git a/hg-evolve-11.1.5.tar.gz b/hg-evolve-11.1.5.tar.gz new file mode 100644 index 0000000..fdbc9f5 --- /dev/null +++ b/hg-evolve-11.1.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3669d2405b31085049b00240154cc180baa3b13771a1685cd48f5b77433848d2 +size 863227 diff --git a/hg-evolve-11.1.6.tar.gz b/hg-evolve-11.1.6.tar.gz new file mode 100644 index 0000000..ac6987e --- /dev/null +++ b/hg-evolve-11.1.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26e9f58196195eff27b890676deacad5b7133d32c20e0186779e3739e38454eb +size 864773 diff --git a/mercurial-extension-hg-evolve.changes b/mercurial-extension-hg-evolve.changes new file mode 100644 index 0000000..63f1872 --- /dev/null +++ b/mercurial-extension-hg-evolve.changes @@ -0,0 +1,189 @@ +------------------------------------------------------------------- +Sat Nov 30 21:56:34 UTC 2024 - Jaime Marquínez Ferrándiz + +- Update to version 11.1.6. + * evolve: unrelated parts of splits are no longer considered + content-divergent, this is a port of an upstream patch included in hg 6.8.2 + * obshashrange: avoid executing too many DELETE requests at once + * obshashrange: reset the cache if too many ranges need to be deleted + topic (1.1.6) + * stack: when stack base is obsolete, pick any successor, even if at random + +------------------------------------------------------------------- +Thu Nov 7 14:22:51 UTC 2024 - Lukas Müller + +- Update to version 11.1.5. + * compatibility with Mercurial 6.9 + * evolve: check that the evolved revisions are indeed in the repo during + abort, fixes an issue when trying to access them during cleanup step + * docs: update installation instructions due to PEP 668 + * docs: minor edits and fixes in evolve and topic tutorials + * tests: more tests related to Python packaging + topic (1.1.5) + * compatibility with Mercurial 6.9 +- Temporarily disable test "test-evolve-templates.t". + +------------------------------------------------------------------- +Thu Sep 12 18:05:51 UTC 2024 - Lukas Müller + +- Use existing python RPM macros instead of defining custom ones. + +------------------------------------------------------------------- +Thu Jul 11 18:30:16 UTC 2024 - Lukas Müller + +- Update to version 11.1.4. + * compatibility with Mercurial 6.8 + topic (1.1.4) + * compatibility with Mercurial 6.8 +- Changes from version 11.1.3: + topic (1.1.3) + * topic namespaces: add hg debug-default-topic-namespace command that can + list changesets with problematic topic namespaces (i.e. "none" and + "default") and rewrite them + * topic namespaces: new experimental.tns-reject-push config to make servers + reject pushes that contain changesets with any topic namespace in commit + extras + * topic namespaces: slightly change .hg/topic-namespace cleanup code to be + executed on acquiring a wlock instead of on reading .hg/topic-namespace + + +------------------------------------------------------------------- +Tue Jun 18 01:23:32 UTC 2024 - Lukas Müller + +- Build package with Python 3.11 on Leap 15.6. + +------------------------------------------------------------------- +Fri Mar 22 17:34:45 UTC 2024 - Lukas Müller + +- Update to version 11.1.2. + * compatibility with Mercurial 6.7 + * evolve: use functions from topic extension to set current topic and tns + topic (1.1.2) + * compatibility with Mercurial 6.7 + * topic: handle commitstatus() with opts=None for hg <= 6.5 too +- Changelog from version 11.1.1. + * compatibility with Mercurial 6.6 + * evolve: fix typo in "mercurial" and let hasmemmergestate be True sometimes + * uncommit: set uncommit_source extra consistently in interactive mode + topic (1.1.1) + * compatibility with Mercurial 6.6 + * topic: properly decode topic and topic namespace after reading from disk + * topic: wrap makebundlerepository() to wrap bundlerepository class (issue6856) + * topic: internal config option to fix hg pick behavior (issue6406) + * topic: use the appropriate functions to change topic and topic namespace on working directory update and don't write empty/default values to disk + * topic namespaces: check that user-provided topic namespace names are human-readable like topics + * topic namespaces: add tns_heads method to wirepeer directly instead of using a subclass + * topic namespaces: remove .hg/topic-namespace file if it has the default value ("none") + +------------------------------------------------------------------- +Tue Oct 24 21:42:57 UTC 2023 - Andrei Dziahel + +- Update to version 11.1.0 + + * drop compatibility with Mercurial 4.8 + * remove deprecated evolve.serveronly extension, evolve extension is + recommended for all users, clients and servers + * evolve: don't warn about topics while resolving public + content-divergence + * evolve, pullbundle: drop compatibility with Mercurial 4.8 + * topic (1.1.0) + * remove deprecated serverminitopic extension, topic extension + is recommended for all users, clients and servers + * pick: update commit message hashes like other rewrite commands + * topic namespaces: add `experimental.tns-allow-rewrite` config option to + check topic namespace before rewriting changesets (known limitations: does + not prevent rebase and histedit from editing changesets outside of + configured topic namespaces on Mercurial 5.2 and older) + * topic namespaces: add `experimental.tns-default-pull-namespaces` config + option to pull only certain changesets by default + * topic namespaces: teach `hg import` and `hg export` to handle topic + namespaces + * topic namespaces: invalidate topic namespace cache in + repo.invalidatecaches() + * topic: only set topic on workingcommitctx if it doesn't already have one, + making `hg import` always prioritize patch metadata + * topic: properly process revbranchcache before sending it to peers + (issue6841) + +------------------------------------------------------------------- +Mon Aug 7 23:08:12 UTC 2023 - Lukas Müller + +- Update to version 11.0.2. + * compatibility with Mercurial 6.5 + * packaging: explicitly use python3 for running tests in debian/rules + +------------------------------------------------------------------- +Mon Mar 27 10:39:04 UTC 2023 - Andrei Dziahel + +- Update to version 11.0.1 + + * compatibility with Mercurial 6.4 + +------------------------------------------------------------------- +Tue Mar 14 12:01:14 UTC 2023 - Lukas Müller + +- Update to version 11.0.0. + Changelog: https://foss.heptapod.net/mercurial/evolve/-/blob/11.0.0/CHANGELOG + * deprecate evolve.serveronly extension, evolve extension is recommended for + all users, clients and servers + * fixup: support `hg abort` + * evolve, pick, fixup: support `hg continue` + * evolve: stop preserving all of {extras} for uninterrupted evolve operations + * evolve: don't embed graft data when completing interrupted evolve + operations + * prune: pruning (without any successors) an already obsolete revision will + no longer give a false warning about divergence + * evolve: use detailed exit codes for most commands (enabled with + `ui.detailed-exit-code=yes`) + +------------------------------------------------------------------- +Thu Dec 22 16:23:43 UTC 2022 - Andrei Dziahel + +- Update to version 10.5.3 + Changelog: https://foss.heptapod.net/mercurial/evolve/-/blob/10.5.3/CHANGELOG +- Temporarily blacklist test-cmdserver.t + +------------------------------------------------------------------- +Tue Jul 19 12:34:38 UTC 2022 - Andrei Dziahel + +- Update to version 10.5.2 + Changelog: https://foss.heptapod.net/mercurial/evolve/-/blob/10.5.2/CHANGELOG + +------------------------------------------------------------------- +Fri Jun 17 17:21:32 UTC 2022 - Lukas Müller + +- Blacklist test that fails due to distutils deprecation warning. + +------------------------------------------------------------------- +Mon May 2 16:33:42 UTC 2022 - Lukas Müller + +- Update to version 10.5.1. + Changelog: https://foss.heptapod.net/mercurial/evolve/-/blob/10.5.1/CHANGELOG + +------------------------------------------------------------------- +Mon Mar 7 18:24:16 UTC 2022 - Lukas Müller + +- Update to version 10.5.0. +- Changelog: https://foss.heptapod.net/mercurial/evolve/-/blob/10.5.0/CHANGELOG + +------------------------------------------------------------------- +Wed Jan 19 16:28:02 UTC 2022 - Lukas Müller + +- Update to version 10.4.1. +- Changelog: https://foss.heptapod.net/mercurial/evolve/-/blob/10.4.1/CHANGELOG + +------------------------------------------------------------------- +Wed Nov 10 03:00:59 UTC 2021 - Lukas Müller + +- Update to version 10.4.0. +- Changelog: https://foss.heptapod.net/mercurial/evolve/-/blob/10.4.0/CHANGELOG + +------------------------------------------------------------------- +Fri Sep 24 22:11:01 UTC 2021 - Lukas Müller + +- Add a test blacklist and run tests on all distributions. + +------------------------------------------------------------------- +Mon Sep 20 18:44:53 UTC 2021 - Lukas Müller + +- Create package mercurial-extension-hg-evolve with hg-evolve version 10.3.3. diff --git a/mercurial-extension-hg-evolve.spec b/mercurial-extension-hg-evolve.spec new file mode 100644 index 0000000..a834bab --- /dev/null +++ b/mercurial-extension-hg-evolve.spec @@ -0,0 +1,81 @@ +# +# spec file for package mercurial-extension-hg-evolve +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%if 0%{?suse_version} > 1600 +# Tumbleweed +%define pythons python3 +%else +%if 0%{?sle_version} >= 150600 +%{?sle15_python_module_pythons} +%else +%define pythons python3 +%endif +%endif + +Name: mercurial-extension-hg-evolve +Version: 11.1.6 +Release: 0 +Summary: Flexible evolution of Mercurial history +License: GPL-2.0-or-later +Group: Development/Tools/Version Control +URL: https://www.mercurial-scm.org/doc/evolution/ +Source0: https://files.pythonhosted.org/packages/source/h/hg-evolve/hg-evolve-%{version}.tar.gz +Source90: tests.blacklist +BuildRequires: %{pythons} +# python311-flake8 is not available on Leap 15.6. +%if 0%{?suse_version} > 1600 || 0%{?sle_version} < 150600 +BuildRequires: %{python_module flake8} +%endif +BuildRequires: %{python_module pyflakes} +BuildRequires: %{python_module setuptools} +BuildRequires: fdupes +BuildRequires: mercurial +BuildRequires: mercurial-tests +BuildRequires: python-rpm-macros +BuildRequires: unzip +Requires: mercurial +BuildArch: noarch + +%description +Flexible evolution of Mercurial history. + +%prep +%setup -q -n hg-evolve-%{version} + +%build +%python_build + +%install +%python_install + +# Delete hgext3rd/__init__.py and its cached version because it is already delivered by mercurial. +rm %{buildroot}%{python_sitelib}/hgext3rd/__init__.py +rm %{buildroot}%{python_sitelib}/hgext3rd/__pycache__/__init__*.pyc + +%fdupes %{buildroot}%{python_sitelib} + +%check +cd tests +%python_exec %{_datadir}/mercurial/tests/run-tests.py --with-hg=%{_bindir}/hg --blacklist=%{SOURCE90} + +%files +%doc CHANGELOG README.rst +%license COPYING +%{python_sitelib}/* + +%changelog diff --git a/tests.blacklist b/tests.blacklist new file mode 100644 index 0000000..0f7726a --- /dev/null +++ b/tests.blacklist @@ -0,0 +1,6 @@ +test-check-sdist.t +test-check-compat-strings.t +test-version-install.t + +test-cmdserver.t +test-evolve-templates.t