mirror of
https://github.com/kuhyx/utils.git
synced 2026-11-10 22:47:14 +01:00
Krzysztof kuhy Rudnicki
6154dc09bf
The three Python packages pinned ruff twice at different versions: requirements.txt at 0.16.7, .pre-commit-config.yaml at v0.15.2. Only the older one ever ran, so `select = ["ALL"]` was enforced two minor versions behind. Measured before aligning: v0.15.2 reports 0 findings, every 0.16.x reports CPY001 on each file -- 70 crdt-sync, 23 freedays, 71 gatelock, and no other rule. Resolved by adding the notice rather than ignoring the rule, so the gate keeps its teeth. Two gatelock modules sat at exactly the 250-line cap, so a one-line header tipped them to 251. Both are split along a real seam rather than shaved: _widget_fills.py colour arithmetic over LockConfig, no tkinter import _surfaces_focus.py selects among existing surfaces, never mutates them The focus split keeps _surfaces.py's documented containment (it stays the only module that creates, moves or destroys windows), and the static guard in test_recovery_invariants.py globs _surfaces*.py, so the new sibling is covered with no list to extend. widgets.py re-exports the fills helpers, which keeps gatelock.widgets the single public surface its tests import. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_019kMvSMtsVMB3d2uoZ56pbp
34 lines
1.0 KiB
Python
34 lines
1.0 KiB
Python
# Copyright (c) 2026 Krzysztof Rudnicki
|
|
"""Log: a collection of Records keyed by id, with a union-merge."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from crdt_sync._record import Record, merge_record
|
|
|
|
Log = dict[str, Record]
|
|
|
|
|
|
def merge_logs(local: Log, remote: Log) -> Log:
|
|
"""Return the union of ``local`` and ``remote``, merging shared ids.
|
|
|
|
Commutative and idempotent: ``merge_logs(a, b) == merge_logs(b, a)`` and
|
|
``merge_logs(x, x) == x``, so pull order between devices never matters
|
|
and a repeated sync tick is a no-op.
|
|
|
|
Args:
|
|
local: This device's current full log (including tombstones).
|
|
remote: Another device's last-pushed full log.
|
|
|
|
Returns:
|
|
The merged log, containing every id present in either input.
|
|
"""
|
|
merged: Log = dict(local)
|
|
for record_id, remote_record in remote.items():
|
|
local_record = merged.get(record_id)
|
|
merged[record_id] = (
|
|
remote_record
|
|
if local_record is None
|
|
else merge_record(local_record, remote_record)
|
|
)
|
|
return merged
|