bcbd1bdb22
Integ / changes (push) Has been skipped
Pre-commit / pre-commit (push) Failing after 1s
CLI exit codes / changes (push) Has been skipped
Test (Install) / changes (push) Has been skipped
Test (Python) / changes (push) Has been skipped
Test (TypeScript) / changes (push) Has been skipped
CLI exit codes / cli-gate (push) Has been cancelled
Test (Install) / test-install-gate (push) Has been cancelled
Integ / integ-gate (push) Has been cancelled
Test (Python) / test-python-gate (push) Has been cancelled
Test (TypeScript) / test-typescript-gate (push) Has been cancelled
Test (Install) / python-minimal (3.12) (push) Has been cancelled
Test (Install) / python-minimal (3.11) (push) Has been cancelled
Test (Install) / python-extra (agno, mirage.agents.agno) (push) Has been cancelled
Test (Install) / python-extra (chroma, mirage.resource.chroma) (push) Has been cancelled
Test (Install) / python-extra (pdf, mirage.core.filetype.pdf) (push) Has been cancelled
Integ / integ (push) Has been cancelled
Integ / integ-database (push) Has been cancelled
Integ / integ-database-ts (push) Has been cancelled
Integ / integ-data (push) Has been cancelled
Integ / integ-ssh (push) Has been cancelled
Integ / integ-ssh-ts (push) Has been cancelled
Test (Python) / audit (push) Has been cancelled
Test (TypeScript) / test (push) Has been cancelled
Test (TypeScript) / python-fs-shim (push) Has been cancelled
CLI exit codes / Python CLI (push) Has been cancelled
CLI exit codes / TypeScript CLI (push) Has been cancelled
CLI exit codes / Cross-language snapshot interop (push) Has been cancelled
Test (Python) / test (push) Has been cancelled
Test (Python) / import-isolation (deepagents, openai, mirage.agents.openai_agents) (push) Has been cancelled
Test (Python) / import-isolation (deepagents, pydantic-ai, mirage.agents.pydantic_ai) (push) Has been cancelled
Integ / integ-ts (push) Has been cancelled
Integ / integ-fuse (push) Has been cancelled
Test (Install) / python-extra (databricks, mirage.resource.databricks_volume) (push) Has been cancelled
Test (Install) / python-extra (deepagents, mirage.agents.langchain) (push) Has been cancelled
Test (Install) / python-extra (email, mirage.resource.email) (push) Has been cancelled
Test (Install) / python-extra (fuse, mirage.fuse.mount) (push) Has been cancelled
Test (Install) / python-extra (hdf5, mirage.core.filetype.hdf5) (push) Has been cancelled
Test (Install) / python-extra (hf, mirage.resource.hf_buckets) (push) Has been cancelled
Test (Install) / python-extra (lancedb, mirage.resource.lancedb) (push) Has been cancelled
Test (Install) / python-extra (langfuse, mirage.resource.langfuse) (push) Has been cancelled
Test (Install) / python-extra (mongodb, mirage.resource.mongodb) (push) Has been cancelled
Test (Install) / python-extra (nextcloud, mirage.resource.nextcloud) (push) Has been cancelled
Test (Install) / python-extra (openai, mirage.agents.openai_agents) (push) Has been cancelled
Test (Install) / python-extra (openhands, mirage.agents.openhands, 3.12) (push) Has been cancelled
Test (Install) / python-extra (parquet, mirage.core.filetype.parquet) (push) Has been cancelled
Test (Install) / python-extra (postgres, mirage.resource.postgres) (push) Has been cancelled
Test (Install) / python-extra (pydantic-ai, mirage.agents.pydantic_ai) (push) Has been cancelled
Test (Install) / python-extra (qdrant, mirage.resource.qdrant) (push) Has been cancelled
Test (Install) / python-extra (redis, mirage.resource.redis) (push) Has been cancelled
Test (Install) / python-extra (s3, mirage.resource.s3) (push) Has been cancelled
Test (Install) / python-extra (ssh, mirage.resource.ssh) (push) Has been cancelled
Test (Install) / ts-minimal (push) Has been cancelled
110 lines
4.0 KiB
Python
110 lines
4.0 KiB
Python
# ========= Copyright 2026 @ Strukto.AI All Rights Reserved. =========
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
# ========= Copyright 2026 @ Strukto.AI All Rights Reserved. =========
|
|
|
|
import difflib
|
|
import re
|
|
|
|
from mirage.commands.builtin.diff_types import DiffOpTag
|
|
from mirage.commands.builtin.utils.types import _ReadBytes
|
|
|
|
|
|
def _ed_script(a_lines: list[str], b_lines: list[str]) -> list[str]:
|
|
sm = difflib.SequenceMatcher(None, a_lines, b_lines)
|
|
edits: list[str] = []
|
|
for tag, i1, i2, j1, j2 in reversed(sm.get_opcodes()):
|
|
if tag == DiffOpTag.EQUAL:
|
|
continue
|
|
if tag == DiffOpTag.DELETE:
|
|
addr = f"{i1 + 1},{i2}" if i2 - i1 > 1 else f"{i1 + 1}"
|
|
edits.append(f"{addr}d\n")
|
|
elif tag == DiffOpTag.INSERT:
|
|
edits.append(f"{i1}a\n")
|
|
for line in b_lines[j1:j2]:
|
|
edits.append(line if line.endswith("\n") else line + "\n")
|
|
edits.append(".\n")
|
|
elif tag == DiffOpTag.REPLACE:
|
|
addr = f"{i1 + 1},{i2}" if i2 - i1 > 1 else f"{i1 + 1}"
|
|
edits.append(f"{addr}c\n")
|
|
for line in b_lines[j1:j2]:
|
|
edits.append(line if line.endswith("\n") else line + "\n")
|
|
edits.append(".\n")
|
|
return edits
|
|
|
|
|
|
def _addr(i1: int, i2: int) -> str:
|
|
return f"{i1 + 1},{i2}" if i2 - i1 > 1 else f"{i1 + 1}"
|
|
|
|
|
|
def _addr_b(j1: int, j2: int) -> str:
|
|
if j2 - j1 > 1:
|
|
return f"{j1 + 1},{j2}"
|
|
if j2 - j1 == 1:
|
|
return f"{j1 + 1}"
|
|
return f"{j1}"
|
|
|
|
|
|
def _normal_diff(a_lines: list[str], b_lines: list[str]) -> list[str]:
|
|
sm = difflib.SequenceMatcher(None, a_lines, b_lines)
|
|
out: list[str] = []
|
|
for tag, i1, i2, j1, j2 in sm.get_opcodes():
|
|
if tag == DiffOpTag.EQUAL:
|
|
continue
|
|
if tag == DiffOpTag.DELETE:
|
|
out.append(f"{_addr(i1, i2)}d{j1}\n")
|
|
for line in a_lines[i1:i2]:
|
|
out.append("< " +
|
|
(line if line.endswith("\n") else line + "\n"))
|
|
elif tag == DiffOpTag.INSERT:
|
|
out.append(f"{i1}a{_addr_b(j1, j2)}\n")
|
|
for line in b_lines[j1:j2]:
|
|
out.append("> " +
|
|
(line if line.endswith("\n") else line + "\n"))
|
|
elif tag == DiffOpTag.REPLACE:
|
|
out.append(f"{_addr(i1, i2)}c{_addr_b(j1, j2)}\n")
|
|
for line in a_lines[i1:i2]:
|
|
out.append("< " +
|
|
(line if line.endswith("\n") else line + "\n"))
|
|
out.append("---\n")
|
|
for line in b_lines[j1:j2]:
|
|
out.append("> " +
|
|
(line if line.endswith("\n") else line + "\n"))
|
|
return out
|
|
|
|
|
|
def diff(
|
|
read_bytes: _ReadBytes,
|
|
path_a: str,
|
|
path_b: str,
|
|
ignore_case: bool = False,
|
|
ignore_whitespace: bool = False,
|
|
ignore_space_change: bool = False,
|
|
ed_script: bool = False,
|
|
) -> list[str]:
|
|
text_a = read_bytes(path_a).decode(errors="replace")
|
|
text_b = read_bytes(path_b).decode(errors="replace")
|
|
if ignore_case:
|
|
text_a = text_a.lower()
|
|
text_b = text_b.lower()
|
|
if ignore_whitespace:
|
|
text_a = re.sub(r"\s+", "", text_a)
|
|
text_b = re.sub(r"\s+", "", text_b)
|
|
if ignore_space_change:
|
|
text_a = re.sub(r"[ \t]+", " ", text_a)
|
|
text_b = re.sub(r"[ \t]+", " ", text_b)
|
|
a_lines = text_a.splitlines(keepends=True)
|
|
b_lines = text_b.splitlines(keepends=True)
|
|
if ed_script:
|
|
return _ed_script(a_lines, b_lines)
|
|
return _normal_diff(a_lines, b_lines)
|