1
0

Compare commits

...

10 Commits

Author SHA256 Message Date
Ana Guerrero
ab2e936803 Accepting request 1244521 from devel:tools:scm
OBS-URL: https://build.opensuse.org/request/show/1244521
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mercurial-extension-hg-evolve?expand=0&rev=16
2025-02-10 16:25:48 +00:00
Lukas Müller
dc437bf547 - Update to version 11.1.7.post1.
* no changes from 11.1.7, only upgraded packaging
- Changes from version 11.1.7:
  * evolve: fix version check from 972d98ce3552 for hg 6.8 (issue6958)
  * obslog: also display patch for rebased changesets (requires Mercurial 5.6
    or newer for in-memory rebase support)

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/mercurial-extension-hg-evolve?expand=0&rev=36
2025-02-09 17:35:47 +00:00
Ana Guerrero
2daf1735ec Accepting request 1233715 from devel:tools:scm
OBS-URL: https://build.opensuse.org/request/show/1233715
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mercurial-extension-hg-evolve?expand=0&rev=15
2024-12-30 11:52:03 +00:00
Lukas Müller
110b35aafb - Reenable test "test-evolve-templates.t".
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/mercurial-extension-hg-evolve?expand=0&rev=34
2024-12-28 23:17:26 +00:00
Ana Guerrero
a2f5014abe Accepting request 1227583 from devel:tools:scm
OBS-URL: https://build.opensuse.org/request/show/1227583
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mercurial-extension-hg-evolve?expand=0&rev=14
2024-12-02 15:58:55 +00:00
9c17af14f7 - 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
2024-12-01 09:12:31 +00:00
Ana Guerrero
e40c390d64 Accepting request 1224318 from devel:tools:scm
OBS-URL: https://build.opensuse.org/request/show/1224318
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mercurial-extension-hg-evolve?expand=0&rev=13
2024-11-15 14:43:30 +00:00
Lukas Müller
b32acbc2b0 - 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".

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/mercurial-extension-hg-evolve?expand=0&rev=30
2024-11-15 00:07:14 +00:00
Ana Guerrero
d27b2a84ed Accepting request 1200812 from devel:tools:scm
OBS-URL: https://build.opensuse.org/request/show/1200812
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mercurial-extension-hg-evolve?expand=0&rev=12
2024-09-15 10:35:43 +00:00
Lukas Müller
4fb6366f51 - Use existing python RPM macros instead of defining custom ones.
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/mercurial-extension-hg-evolve?expand=0&rev=28
2024-09-13 11:21:52 +00:00
4 changed files with 57 additions and 21 deletions

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:629876836e787d29cf55f8269267914aa966b147c780ffb0a8dd061cb215ff07
size 861472

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d87435b2e4e93618a230379fe3bd3e2e9fed44cbd4d2f50cd15ab70046fa8b6e
size 900415

@ -1,3 +1,48 @@
-------------------------------------------------------------------
Fri Feb 7 21:24:41 UTC 2025 - Sean Baggaley <me@drinkybird.net>
- Update to version 11.1.7.post1.
* no changes from 11.1.7, only upgraded packaging
- Changes from version 11.1.7:
* evolve: fix version check from 972d98ce3552 for hg 6.8 (issue6958)
* obslog: also display patch for rebased changesets (requires Mercurial 5.6
or newer for in-memory rebase support)
-------------------------------------------------------------------
Sun Dec 1 22:02:39 UTC 2024 - Lukas Müller <expeehaa@outlook.com>
- Reenable test "test-evolve-templates.t".
-------------------------------------------------------------------
Sat Nov 30 21:56:34 UTC 2024 - Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fastmail.net>
- 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 <expeehaa@outlook.com>
- 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 <expeehaa@outlook.com>
- Use existing python RPM macros instead of defining custom ones.
-------------------------------------------------------------------
Thu Jul 11 18:30:16 UTC 2024 - Lukas Müller <expeehaa@outlook.com>

@ -1,7 +1,7 @@
#
# spec file for package mercurial-extension-hg-evolve
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,26 +18,17 @@
%if 0%{?suse_version} > 1600
# Tumbleweed
%define pythons python3
%define mercurial_python python3
%define mercurial_python_executable python3
%define pythons python3
%else
%if 0%{?sle_version} >= 150600
%{?sle15_python_module_pythons}
# Leap 15.6
%if %pythons == "python311"
%define mercurial_python python311
%define mercurial_python_executable python3.11
%endif
%else
%define pythons python3
%define mercurial_python python3
%define mercurial_python_executable python3
%define pythons python3
%endif
%endif
Name: mercurial-extension-hg-evolve
Version: 11.1.4
Version: 11.1.7.post1
Release: 0
Summary: Flexible evolution of Mercurial history
License: GPL-2.0-or-later
@ -45,13 +36,13 @@ 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: %{mercurial_python}
BuildRequires: %{pythons}
# python311-flake8 is not available on Leap 15.6.
%if 0%{?suse_version} > 1600 || 0%{?sle_version} < 150600
BuildRequires: %{mercurial_python}-flake8
BuildRequires: %{python_module flake8}
%endif
BuildRequires: %{mercurial_python}-pyflakes
BuildRequires: %{mercurial_python}-setuptools
BuildRequires: %{python_module pyflakes}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: mercurial
BuildRequires: mercurial-tests
@ -80,7 +71,7 @@ rm %{buildroot}%{python_sitelib}/hgext3rd/__pycache__/__init__*.pyc
%check
cd tests
%{mercurial_python_executable} %{_datadir}/mercurial/tests/run-tests.py --with-hg=%{_bindir}/hg --blacklist=%{SOURCE90}
%python_exec %{_datadir}/mercurial/tests/run-tests.py --with-hg=%{_bindir}/hg --blacklist=%{SOURCE90}
%files
%doc CHANGELOG README.rst