forked from pool/mercurial-extension-hg-evolve
Compare commits
40 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 625fa5d244 | |||
| a3677e5832 | |||
| f1ff74868c | |||
| 1e843b66f8 | |||
| ab2e936803 | |||
| dc437bf547 | |||
| 2daf1735ec | |||
| 110b35aafb | |||
| a2f5014abe | |||
| 9c17af14f7 | |||
| e40c390d64 | |||
| b32acbc2b0 | |||
| d27b2a84ed | |||
| 4fb6366f51 | |||
| 8dcb318c70 | |||
| 42bee2e0ea | |||
| 2c601141ff | |||
| 6eda5605ca | |||
| a107df479e | |||
| 5a3fd1791b | |||
| 6136fdc2b5 | |||
| b9ed57b0ed | |||
| 1b245e35d4 | |||
| c413e7d2e7 | |||
| 27a9c39e1d | |||
| 6be1a9149a | |||
| 1df6ffb95c | |||
| 0e87d01d96 | |||
| 80b2d3e2d1 | |||
| e06488d059 | |||
| 0430724f2c | |||
| 689a3112d5 | |||
| 25ffae42ba | |||
| b03fa1ee72 | |||
| ece26292b6 | |||
| 6f540dbfbb | |||
| da2d3ca525 | |||
|
1e1cc9b1df | ||
|
|
ca36e43fa2 | ||
|
|
5fe478d08f |
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ba0f93d6c45207e279172ab375347bc59b6fc9b85dcc165823b838ad7d780c7a
|
||||
size 860623
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:629876836e787d29cf55f8269267914aa966b147c780ffb0a8dd061cb215ff07
|
||||
size 861472
|
||||
3
hg_evolve-11.1.8.tar.gz
Normal file
3
hg_evolve-11.1.8.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2486dead90a2466c4f927d0ff83b29b38da31d686403584b2865cf95b6fe00f5
|
||||
size 899277
|
||||
@@ -1,3 +1,62 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 26 23:26:37 UTC 2025 - Sean Baggaley <me@drinkybird.net>
|
||||
|
||||
- Use PEP 517/518 build system via pyproject macros
|
||||
- Use more specific sitelib install paths to fix an rpmlint warning
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 12 13:06:28 UTC 2025 - Sean Baggaley <me@drinkybird.net>
|
||||
|
||||
- Update to version 11.1.8.
|
||||
* compatibility with Mercurial 7.0
|
||||
topic (1.1.8)
|
||||
* compatibility with Mercurial 7.0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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,40 +18,33 @@
|
||||
|
||||
%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.8
|
||||
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
|
||||
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 pip}
|
||||
BuildRequires: %{python_module pyflakes}
|
||||
BuildRequires: %{python_module setuptools}
|
||||
BuildRequires: %{python_module wheel}
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: mercurial
|
||||
BuildRequires: mercurial-tests
|
||||
@@ -64,13 +57,13 @@ BuildArch: noarch
|
||||
Flexible evolution of Mercurial history.
|
||||
|
||||
%prep
|
||||
%setup -q -n hg-evolve-%{version}
|
||||
%setup -q -n hg_evolve-%{version}
|
||||
|
||||
%build
|
||||
%python_build
|
||||
%pyproject_wheel
|
||||
|
||||
%install
|
||||
%python_install
|
||||
%pyproject_install
|
||||
|
||||
# Delete hgext3rd/__init__.py and its cached version because it is already delivered by mercurial.
|
||||
rm %{buildroot}%{python_sitelib}/hgext3rd/__init__.py
|
||||
@@ -80,11 +73,12 @@ 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
|
||||
%license COPYING
|
||||
%{python_sitelib}/*
|
||||
%{python_sitelib}/hgext3rd
|
||||
%{python_sitelib}/hg_evolve-%{version}*-info
|
||||
|
||||
%changelog
|
||||
|
||||
Reference in New Issue
Block a user