gitacross 2.3.1__tar.gz → 2.3.2__tar.gz

{gitacross-2.3.1/src/gitacross.egg-info → gitacross-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitacross
-Version: 2.3.1
+Version: 2.3.2
 Summary: Mirror releases and git commits across platforms (Gitea, GitHub, local) with transform pipelines.
 Author: Matthew Deik
 License-Expression: MIT
@@ -223,7 +223,7 @@ Stream each asset upload directly from the temporary download directory on disk
 
 ### Source mode: release, tag, or commit
 
-Remote sources sync from the host's **API releases** by default. Two alternatives are available: git tags, or the latest commit of a branch. A `sync_from` key on the source sets the starting point — only releases from that tag onward are synced.
+Remote sources sync from the host's **API releases** by default. Two alternatives are available: git tags, or the latest commit of a branch. A `sync_from` key on the source sets the starting point — only releases from that tag onward are synced. If the exact tag no longer exists (renamed or deleted upstream), releases with a **higher version** are synced instead, so an absent anchor never blocks newer releases. Both SemVer tags (`v1.2.3`) and calendar tags (`2024.05.01`, `2024-05-01`) are compared version-wise; the two schemes are never confused with each other.
 
 Synced state is keyed by **tag name**, so switching a repo between `release` and `tag` modes is safe: already-synced tags are skipped regardless of the current mode (older state files keyed by API release id are migrated automatically).
 

{gitacross-2.3.1 → gitacross-2.3.2}/README.md

@@ -194,7 +194,7 @@ Stream each asset upload directly from the temporary download directory on disk
 
 ### Source mode: release, tag, or commit
 
-Remote sources sync from the host's **API releases** by default. Two alternatives are available: git tags, or the latest commit of a branch. A `sync_from` key on the source sets the starting point — only releases from that tag onward are synced.
+Remote sources sync from the host's **API releases** by default. Two alternatives are available: git tags, or the latest commit of a branch. A `sync_from` key on the source sets the starting point — only releases from that tag onward are synced. If the exact tag no longer exists (renamed or deleted upstream), releases with a **higher version** are synced instead, so an absent anchor never blocks newer releases. Both SemVer tags (`v1.2.3`) and calendar tags (`2024.05.01`, `2024-05-01`) are compared version-wise; the two schemes are never confused with each other.
 
 Synced state is keyed by **tag name**, so switching a repo between `release` and `tag` modes is safe: already-synced tags are skipped regardless of the current mode (older state files keyed by API release id are migrated automatically).
 

{gitacross-2.3.1 → gitacross-2.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gitacross"
-version = "2.3.1"
+version = "2.3.2"
 description = "Mirror releases and git commits across platforms (Gitea, GitHub, local) with transform pipelines."
 readme = "README.md"
 requires-python = ">=3.8"

{gitacross-2.3.1 → gitacross-2.3.2}/src/gitacross/source.py

@@ -6,6 +6,7 @@ from __future__ import annotations
 
 import fnmatch
 import logging
+import re
 from pathlib import Path
 from typing import final
 
@@ -31,20 +32,122 @@ def create_source(config, cache_dir, dry_run=False):
     )
 
 
-def _filter_from_sync_point(releases, sync_from):
-    """Filter to releases at or after the sync_from tag (inclusive).
+# Calendar versions start with a 4-digit year (YYYY[.MM[.DD[...]]], e.g.
+# 2024.05.01 or 2024-05-01). Every dot/dash/underscore-separated numeric
+# field is part of the date sequence.
+_CALENDAR_RE = re.compile(r"[^0-9]*(\d{4}(?:[._-]\d{1,4})*)")
+# SemVer-style cores are dot-separated numbers; a hyphen introduces a
+# prerelease, never another core field.
+_SEMVER_CORE_RE = re.compile(r"(\d+(?:\.\d+)*)")
+
+
+def _version_key(tag):
+    """Parse a version-like tag into a comparable ``(fields, prerelease)`` key.
+
+    Two schemes are supported, parsed separately because they are semantically
+    different:
 
-    Releases must already be sorted oldest-first. If sync_from is empty
-    return all releases. If the tag isn't found, return nothing —
-    better to skip than silently backfill history.
+    * **SemVer** — ``v1.2.3``, ``v1.2.3-rc.1``. Dot-separated core; a hyphen
+      starts a prerelease that sorts before the final release.
+    * **Calendar (CalVer)** — ``2024.05.01``, ``2024-05-01``, ``2024.05``.
+      Date-based: a leading 4-digit year marks it, and every numeric field
+      (dot *or* dash separated) belongs to the (year, month, day, ...)
+      sequence, compared as plain numbers. No major/minor/patch or SemVer
+      prerelease semantics apply to the date fields themselves.
+
+    Returns ``None`` when the tag carries no parseable version.
+    """
+    if not isinstance(tag, str):
+        return None
+    calendar = _CALENDAR_RE.match(tag)
+    if calendar:
+        fields = tuple(int(part) for part in re.split(r"[._-]", calendar.group(1)))
+        rest = tag[calendar.end():].split("+", 1)[0]
+    else:
+        match = _SEMVER_CORE_RE.search(tag)
+        if not match:
+            return None
+        fields = tuple(int(part) for part in match.group(1).split("."))
+        rest = tag[match.end():].split("+", 1)[0]
+    # Anything remaining after the version fields is a prerelease; build
+    # metadata ("+...") is ignored for ordering, per SemVer.
+    ids = tuple(re.findall(r"[0-9A-Za-z]+", rest))
+    return fields, (ids or None)
+
+
+def _cmp_version_key(a, b):
+    """Compare two ``_version_key`` results: -1/0/1 (SemVer-ish ordering)."""
+    (ca, pa), (cb, pb) = a, b
+    width = max(len(ca), len(cb))
+    ca += (0,) * (width - len(ca))
+    cb += (0,) * (width - len(cb))
+    if ca != cb:
+        return 1 if ca > cb else -1
+    # Same core: a final release outranks any prerelease of it
+    if pa is None and pb is None:
+        return 0
+    if pa is None:
+        return 1
+    if pb is None:
+        return -1
+    # Compare prerelease identifiers: numeric < alphanumeric, identifiers
+    # compare numerically when both numeric, lexically when both alphanumeric
+    for x, y in zip(pa, pb):
+        xn, yn = x.isdigit(), y.isdigit()
+        if xn and yn:
+            xi, yi = int(x), int(y)
+            if xi != yi:
+                return 1 if xi > yi else -1
+        elif xn != yn:
+            return -1 if xn else 1
+        elif x != y:
+            return 1 if x > y else -1
+    return 1 if len(pa) > len(pb) else (-1 if len(pa) < len(pb) else 0)
+
+
+def _newer_than_version(tag, cutoff):
+    """True when *tag* parses as a version strictly newer than *cutoff*."""
+    key = _version_key(tag)
+    return key is not None and _cmp_version_key(key, cutoff) > 0
+
+
+def _filter_from_sync_point(releases, sync_from):
+    """Filter to releases at or after the sync_from tag.
+
+    Releases must already be sorted oldest-first. If sync_from is empty return
+    all releases. When the exact tag is present, everything from it onwards is
+    included; when it is missing (renamed, deleted, or never released), releases
+    whose version is strictly newer than sync_from are synced instead. Tags that
+    cannot be compared (no version digits) are skipped rather than silently
+    backfilling history.
     """
     if not sync_from:
         return releases
     for i, rel in enumerate(releases):
         if rel["tag_name"] == sync_from:
             return releases[i:]
-    logger.warning("sync_from tag '%s' not found — syncing nothing", sync_from)
-    return []
+
+    # Exact tag not found — fall back to releases with a newer version.
+    cutoff = _version_key(sync_from)
+    if cutoff is None:
+        logger.warning(
+            "sync_from '%s' not found and is not version-like — syncing nothing",
+            sync_from,
+        )
+        return []
+    newer = [r for r in releases if _newer_than_version(r.get("tag_name"), cutoff)]
+    if not newer:
+        logger.warning(
+            "sync_from tag '%s' not found and no releases are newer — syncing nothing",
+            sync_from,
+        )
+    else:
+        logger.info(
+            "sync_from tag '%s' not found — syncing %d release(s) newer than it",
+            sync_from,
+            len(newer),
+        )
+    return newer
 
 
 # ---------------------------------------------------------------------------

{gitacross-2.3.1 → gitacross-2.3.2/src/gitacross.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitacross
-Version: 2.3.1
+Version: 2.3.2
 Summary: Mirror releases and git commits across platforms (Gitea, GitHub, local) with transform pipelines.
 Author: Matthew Deik
 License-Expression: MIT
@@ -223,7 +223,7 @@ Stream each asset upload directly from the temporary download directory on disk
 
 ### Source mode: release, tag, or commit
 
-Remote sources sync from the host's **API releases** by default. Two alternatives are available: git tags, or the latest commit of a branch. A `sync_from` key on the source sets the starting point — only releases from that tag onward are synced.
+Remote sources sync from the host's **API releases** by default. Two alternatives are available: git tags, or the latest commit of a branch. A `sync_from` key on the source sets the starting point — only releases from that tag onward are synced. If the exact tag no longer exists (renamed or deleted upstream), releases with a **higher version** are synced instead, so an absent anchor never blocks newer releases. Both SemVer tags (`v1.2.3`) and calendar tags (`2024.05.01`, `2024-05-01`) are compared version-wise; the two schemes are never confused with each other.
 
 Synced state is keyed by **tag name**, so switching a repo between `release` and `tag` modes is safe: already-synced tags are skipped regardless of the current mode (older state files keyed by API release id are migrated automatically).
 

{gitacross-2.3.1 → gitacross-2.3.2}/tests/test_source.py

@@ -103,9 +103,172 @@ def test_source_local_sync_from():
         releases2 = src2.fetch_releases()
         assert releases2 == []
 
+        # sync_from = missing tag but with newer releases present — the newer
+        # releases are synced instead of syncing nothing
+        cfg3 = _EndpointConfig(
+            {
+                "type": "local",
+                "path": str(repo),
+                "tag_pattern": "v*",
+                "sync_from": "v1.5",
+            },
+            is_source=True,
+        )
+        src3 = create_source(cfg3, tmp)
+        tags3 = [r["tag_name"] for r in src3.fetch_releases()]
+        assert tags3 == ["v2.0", "v3.0"]
+
         print("  ✓ source: local sync_from")
 
 
+def test_filter_from_sync_point_fallback_newer_versions():
+    """A missing sync_from tag falls back to releases with a newer version."""
+    from gitacross.source import _filter_from_sync_point
+
+    def rel(tag):
+        return {"tag_name": tag}
+
+    all_rel = [rel("v0.8.0"), rel("v0.9.0"), rel("v1.0.0"), rel("v1.2.0"), rel("v2.0.0")]
+
+    # Exact match: everything from the tag onwards (unchanged behaviour)
+    assert [r["tag_name"] for r in _filter_from_sync_point(all_rel, "v0.9.0")] == [
+        "v0.9.0", "v1.0.0", "v1.2.0", "v2.0.0",
+    ]
+
+    # Missing tag: only strictly-newer versions are kept (v0.8.0 < v0.9.0)
+    assert [r["tag_name"] for r in _filter_from_sync_point(all_rel, "v0.9.1")] == [
+        "v1.0.0", "v1.2.0", "v2.0.0",
+    ]
+
+    # Numeric (not lexicographic) comparison: v0.10.0 > v0.9.9
+    assert [
+        r["tag_name"]
+        for r in _filter_from_sync_point([rel("v0.10.0"), rel("v0.9.0")], "v0.9.9")
+    ] == ["v0.10.0"]
+
+    # Zero-padding: v1.2 == v1.2.0, so it is NOT counted as newer
+    assert [
+        r["tag_name"]
+        for r in _filter_from_sync_point([rel("v1.2"), rel("v1.3")], "v1.2.0")
+    ] == ["v1.3"]
+
+    # No newer release and nothing comparable -> nothing synced
+    assert _filter_from_sync_point([rel("v0.5.0")], "v0.9.0") == []
+    assert _filter_from_sync_point([rel("v0.9.0"), rel("latest")], "v0.9.1") == []
+
+    # A non-version sync_from cannot be compared -> nothing synced
+    assert _filter_from_sync_point(all_rel, "alpha") == []
+
+    # Unversioned / non-string release tags are never counted as newer
+    assert _filter_from_sync_point(
+        [rel("latest"), {"tag_name": None}, rel("v1.0.0")], "v0.9.0"
+    ) == [rel("v1.0.0")]
+
+    # SemVer: a prerelease of a version is OLDER than its final release, so a
+    # missing v1.2.3 never pulls in v1.2.3-rc.1 — only truly newer versions do
+    assert [
+        r["tag_name"]
+        for r in _filter_from_sync_point([rel("v1.2.3-rc.1"), rel("v1.2.4")], "v1.2.3")
+    ] == ["v1.2.4"]
+
+    # Prerelease identifier ordering: numeric pre identifiers compare
+    # numerically, and a final release outranks any prerelease of its version
+    assert [
+        r["tag_name"]
+        for r in _filter_from_sync_point(
+            [rel("v1.2.3-rc.2"), rel("v1.2.3")], "v1.2.3-rc.1"
+        )
+    ] == ["v1.2.3-rc.2", "v1.2.3"]
+
+    # SemVer: numeric prerelease identifiers sort BEFORE alphanumeric ones, and
+    # a final release outranks every prerelease of its version
+    assert [
+        r["tag_name"]
+        for r in _filter_from_sync_point(
+            [rel("v1.0.0-1"), rel("v1.0.0-10"), rel("v1.0.0-beta"), rel("v1.0.0")],
+            "v1.0.0-2",
+        )
+    ] == ["v1.0.0-10", "v1.0.0-beta", "v1.0.0"]
+
+    # Build metadata is ignored for ordering
+    assert [
+        r["tag_name"]
+        for r in _filter_from_sync_point([rel("v1.2.3+meta"), rel("v1.2.4")], "v1.2.3")
+    ] == ["v1.2.4"]
+
+    # Alphanumeric prerelease identifiers compare lexically (beta > alpha), and
+    # longer identifier lists after an equal prefix sort later
+    assert [
+        r["tag_name"]
+        for r in _filter_from_sync_point(
+            [rel("v1.0.0-alpha.1"), rel("v1.0.0-beta"), rel("v1.0.0")],
+            "v1.0.0-alpha",
+        )
+    ] == ["v1.0.0-alpha.1", "v1.0.0-beta", "v1.0.0"]
+    assert [
+        r["tag_name"]
+        for r in _filter_from_sync_point(
+            [
+                rel("v1.0.0-alpha"),
+                rel("v1.0.0-beta"),
+                rel("v1.0.0-alpha.2"),
+                rel("v1.0.0-alpha.1.beta"),
+            ],
+            "v1.0.0-alpha.1",
+        )
+    ] == ["v1.0.0-beta", "v1.0.0-alpha.2", "v1.0.0-alpha.1.beta"]
+
+    # ── Calendar versions (CalVer) are date-based, not SemVer ──
+    # Dot-shaped dates compare as plain (year, month, day) numbers
+    assert [
+        r["tag_name"]
+        for r in _filter_from_sync_point(
+            [rel("2024.01.15"), rel("2024.04.30"), rel("2024.05.01")], "2024.04.01"
+        )
+    ] == ["2024.04.30", "2024.05.01"]
+
+    # Dash-separated dates: '-' joins date fields; it is NOT a prerelease
+    # marker, so 2024-06-01 is newer than 2024-05-01
+    assert [
+        r["tag_name"]
+        for r in _filter_from_sync_point(
+            [rel("2024-04-15"), rel("2024-06-01")], "2024-05-01"
+        )
+    ] == ["2024-06-01"]
+
+    # Month-only anchor (2024.05 = May) vs day releases
+    assert [
+        r["tag_name"]
+        for r in _filter_from_sync_point([rel("2024.04"), rel("2024.05.10")], "2024.05")
+    ] == ["2024.05.10"]
+
+    # A prerelease of the same calendar date is not newer than the date itself
+    assert [
+        r["tag_name"]
+        for r in _filter_from_sync_point(
+            [rel("2024.05.01-rc.1"), rel("2024.05.02")], "2024.05.01"
+        )
+    ] == ["2024.05.02"]
+
+    # Scheme switch on one repo: a 2024.x calendar tag clears a v2-era SemVer
+    # anchor, while a v9.x tag never clears a 2024 calendar anchor
+    assert [
+        r["tag_name"]
+        for r in _filter_from_sync_point([rel("v2.9.0"), rel("2024.01.15")], "v2.9.9")
+    ] == ["2024.01.15"]
+    assert [
+        r["tag_name"]
+        for r in _filter_from_sync_point(
+            [rel("2024.02.01"), rel("v9.9.9")], "2024.01.15"
+        )
+    ] == ["2024.02.01"]
+
+    # No sync_from -> everything
+    assert len(_filter_from_sync_point(all_rel, "")) == 5
+
+    print("  ✓ source: missing sync_from falls back to newer versions")
+
+
 def test_source_remote_mode_tag_sync_from():
     """mode: tag reads releases straight from git tags, no API involved."""
     from unittest import mock