jjdiff 0.1.0__tar.gz

jjdiff-0.1.0/PKG-INFO

@@ -0,0 +1,35 @@
+Metadata-Version: 2.3
+Name: jjdiff
+Version: 0.1.0
+Summary: Add your description here
+Author: Daan van der Kallen
+Author-email: Daan van der Kallen <mail@daanvdk.com>
+Requires-Python: >=3.13
+Description-Content-Type: text/markdown
+
+# jjdiff
+A TUI that can be used as a diff editor in the jujutsu vcs.
+
+jjdiff will show all changes and allow you to navigate through them and
+(partially) select them to be included.
+
+jjdiff makes it easy to navigate the diff by having a 2 dimensional cursor that
+can 'grow' and 'shrink'.
+
+This cursor can operate on 3 levels:
+- Change: select an entire change
+- Hunk: select a group of edited lines in a file
+- Line: select a single edited line in a file
+
+## Keybindings
+| Command | Key | Description |
+| --- | --- | --- |
+| `exit` | `escape`, `ctrl+c` or `ctrl+d` | Exit the diff editor with status code 1, causing the diff to not be applied. |
+| `next_cursor` | `j`, `down` or `tab` | Select the next entry. |
+| `prev_cursor` | `k`, `up` or `shift+tab` | Select the previous entry. |
+| `shrink_cursor` | `l` or `right` | Shrink the cursor. So go from change to hunk and from hunk to line. If the cursor is on an unopened change it will open it first. |
+| `grow_cursor` | `h` or `left` | Grow the cursor. So go from line to hunk and from hunk to change. If the cursor is on an opened change it will close it. |
+| `select_cursor` | `space` | Mark everything selected by the cursor to be included. If everything is already marked it will exclude it instead. This will also select the next entry. |
+| `confirm` | `enter` | Confirm the selected changes. | 
+| `undo` | `u` | Undo the last command. Commands that only affect the UI state like changing the cursor and opening/closing changes are not included in this. |
+| `redo` | `U` | Redo the last undone command. Commands that only affect the UI state like changing the cursor and opening/closing changes are not included in this. |

jjdiff-0.1.0/README.md

@@ -0,0 +1,26 @@
+# jjdiff
+A TUI that can be used as a diff editor in the jujutsu vcs.
+
+jjdiff will show all changes and allow you to navigate through them and
+(partially) select them to be included.
+
+jjdiff makes it easy to navigate the diff by having a 2 dimensional cursor that
+can 'grow' and 'shrink'.
+
+This cursor can operate on 3 levels:
+- Change: select an entire change
+- Hunk: select a group of edited lines in a file
+- Line: select a single edited line in a file
+
+## Keybindings
+| Command | Key | Description |
+| --- | --- | --- |
+| `exit` | `escape`, `ctrl+c` or `ctrl+d` | Exit the diff editor with status code 1, causing the diff to not be applied. |
+| `next_cursor` | `j`, `down` or `tab` | Select the next entry. |
+| `prev_cursor` | `k`, `up` or `shift+tab` | Select the previous entry. |
+| `shrink_cursor` | `l` or `right` | Shrink the cursor. So go from change to hunk and from hunk to line. If the cursor is on an unopened change it will open it first. |
+| `grow_cursor` | `h` or `left` | Grow the cursor. So go from line to hunk and from hunk to change. If the cursor is on an opened change it will close it. |
+| `select_cursor` | `space` | Mark everything selected by the cursor to be included. If everything is already marked it will exclude it instead. This will also select the next entry. |
+| `confirm` | `enter` | Confirm the selected changes. | 
+| `undo` | `u` | Undo the last command. Commands that only affect the UI state like changing the cursor and opening/closing changes are not included in this. |
+| `redo` | `U` | Redo the last undone command. Commands that only affect the UI state like changing the cursor and opening/closing changes are not included in this. |

jjdiff-0.1.0/pyproject.toml

@@ -0,0 +1,29 @@
+[project]
+name = "jjdiff"
+version = "0.1.0"
+description = "Add your description here"
+readme = "README.md"
+authors = [
+    { name = "Daan van der Kallen", email = "mail@daanvdk.com" }
+]
+requires-python = ">=3.13"
+dependencies = []
+
+[project.scripts]
+jjdiff = "jjdiff:main"
+
+[tool.pyright]
+venvPath = "."
+venv = ".venv"
+reportUnusedCallResult = false
+
+[build-system]
+requires = ["uv_build>=0.8.0,<0.9"]
+build-backend = "uv_build"
+
+[dependency-groups]
+dev = [
+    "mypy>=1.17.0",
+    "pytest>=8.4.1",
+    "ruff>=0.12.5",
+]

jjdiff-0.1.0/src/jjdiff/__init__.py

@@ -0,0 +1,24 @@
+import argparse
+from pathlib import Path
+from typing import cast
+
+from .change import apply_changes, reverse_changes
+from .diff import diff
+from .edit import edit_changes
+
+
+parser = argparse.ArgumentParser()
+parser.add_argument("old", type=Path)
+parser.add_argument("new", type=Path)
+
+
+def main() -> None:
+    args = parser.parse_args()
+    old = cast(Path, args.old)
+    new = cast(Path, args.new)
+
+    new.joinpath("JJ-INSTRUCTIONS").unlink()
+
+    changes = tuple(diff(old, new))
+    apply_changes(new, reverse_changes(changes))
+    apply_changes(new, edit_changes(changes))

jjdiff-0.1.0/src/jjdiff/change.py

@@ -0,0 +1,287 @@
+from collections.abc import Iterable, Iterator, Sequence
+from dataclasses import dataclass
+from pathlib import Path
+import stat
+from typing import Literal
+
+
+type LineStatus = Literal["added", "deleted", "changed", "unchanged"]
+
+
+@dataclass
+class Line:
+    old: str | None
+    new: str | None
+
+    @property
+    def status(self) -> LineStatus:
+        if self.old is None:
+            return "added"
+        elif self.new is None:
+            return "deleted"
+        elif self.old != self.new:
+            return "changed"
+        else:
+            return "unchanged"
+
+
+@dataclass
+class Rename:
+    old_path: Path
+    new_path: Path
+
+
+@dataclass
+class ChangeMode:
+    path: Path
+    old_is_exec: bool
+    new_is_exec: bool
+
+
+@dataclass
+class AddFile:
+    path: Path
+    lines: list[Line]
+    is_exec: bool
+
+
+@dataclass
+class ModifyFile:
+    path: Path
+    lines: list[Line]
+
+
+@dataclass
+class DeleteFile:
+    path: Path
+    lines: list[Line]
+    is_exec: bool
+
+
+@dataclass
+class AddBinary:
+    path: Path
+    data: bytes
+    is_exec: bool
+
+
+@dataclass
+class ModifyBinary:
+    path: Path
+    old_data: bytes
+    new_data: bytes
+
+
+@dataclass
+class DeleteBinary:
+    path: Path
+    data: bytes
+    is_exec: bool
+
+
+@dataclass
+class AddSymlink:
+    path: Path
+    to: Path
+
+
+@dataclass
+class ModifySymlink:
+    path: Path
+    old_to: Path
+    new_to: Path
+
+
+@dataclass
+class DeleteSymlink:
+    path: Path
+    to: Path
+
+
+type FileChange = AddFile | ModifyFile | DeleteFile
+type BinaryChange = AddBinary | ModifyBinary | DeleteBinary
+type SymlinkChange = AddSymlink | ModifySymlink | DeleteSymlink
+type Change = Rename | ChangeMode | FileChange | BinaryChange | SymlinkChange
+
+
+FILE_CHANGE_TYPES = (AddFile, ModifyFile, DeleteFile)
+
+
+def reverse_changes(changes: Sequence[Change]) -> Iterator[Change]:
+    renames: dict[Path, Path] = {}
+    for change in changes:
+        if isinstance(change, Rename):
+            renames[change.old_path] = change.new_path
+
+    for change in reversed(changes):
+        match change:
+            case Rename(old_path, new_path):
+                yield Rename(new_path, old_path)
+
+            case ChangeMode(path, old_is_exec, new_is_exec):
+                path = renames.get(path, path)
+                yield ChangeMode(path, new_is_exec, old_is_exec)
+
+            case AddFile(path, lines, is_exec):
+                path = renames.get(path, path)
+                yield DeleteFile(path, reverse_lines(lines), is_exec)
+
+            case ModifyFile(path, lines):
+                path = renames.get(path, path)
+                yield ModifyFile(path, reverse_lines(lines))
+
+            case DeleteFile(path, lines, is_exec):
+                path = renames.get(path, path)
+                yield AddFile(path, reverse_lines(lines), is_exec)
+
+            case AddBinary(path, data, is_exec):
+                path = renames.get(path, path)
+                yield DeleteBinary(path, data, is_exec)
+
+            case ModifyBinary(path, old_data, new_data):
+                path = renames.get(path, path)
+                yield ModifyBinary(path, new_data, old_data)
+
+            case DeleteBinary(path, data, is_exec):
+                path = renames.get(path, path)
+                yield AddBinary(path, data, is_exec)
+
+            case AddSymlink(path, to):
+                path = renames.get(path, path)
+                yield DeleteSymlink(path, to)
+
+            case ModifySymlink(path, old_to, new_to):
+                path = renames.get(path, path)
+                yield ModifySymlink(path, new_to, old_to)
+
+            case DeleteSymlink(path, to):
+                path = renames.get(path, path)
+                yield AddSymlink(path, to)
+
+
+def reverse_lines(lines: list[Line]) -> list[Line]:
+    return [Line(line.new, line.old) for line in lines]
+
+
+@dataclass(frozen=True)
+class ChangeRef:
+    change: int
+
+
+@dataclass(frozen=True)
+class LineRef:
+    change: int
+    line: int
+
+
+type Ref = ChangeRef | LineRef
+
+
+def filter_changes(
+    refs: set[Ref],
+    changes: Iterable[Change],
+) -> Iterator[Change]:
+    for change_index, change in enumerate(changes):
+        change_ref = ChangeRef(change_index)
+
+        # For non file changes we just include the whole change or not
+        if not isinstance(change, FILE_CHANGE_TYPES):
+            if change_ref in refs:
+                yield change
+            continue
+
+        # Now that we know we have a file change, we first filter the lines
+        lines: list[Line] = []
+        line_changes = False
+
+        for line_index, line in enumerate(change.lines):
+            line_ref = LineRef(change_index, line_index)
+            if line_ref in refs:
+                lines.append(line)
+                line_changes = True
+            elif line.old is not None:
+                lines.append(Line(line.old, line.old))
+
+        # Now we can check what the filtered change looks like
+        match change:
+            case AddFile(path, _, is_exec):
+                if change_ref in refs:
+                    yield AddFile(path, lines, is_exec)
+
+            case ModifyFile(path):
+                if line_changes:
+                    yield ModifyFile(path, lines)
+
+            case DeleteFile(path, _, is_exec):
+                if change_ref in refs:
+                    yield DeleteFile(path, lines, is_exec)
+                elif line_changes:
+                    yield ModifyFile(path, lines)
+
+
+def apply_changes(root: Path, changes: Iterable[Change]) -> None:
+    for change in changes:
+        apply_change(root, change)
+
+
+def apply_change(root: Path, change: Change) -> None:
+    renames: dict[Path, Path] = {}
+
+    match change:
+        case Rename(old_path, new_path):
+            full_old_path = root / old_path
+            full_new_path = root / new_path
+            full_old_path.rename(full_new_path)
+
+        case ChangeMode(path, _, is_exec):
+            path = renames.get(path, path)
+            full_path = root / path
+
+            mode = full_path.stat().st_mode
+            if is_exec:
+                mode |= stat.S_IXUSR
+            else:
+                mode &= ~stat.S_IXUSR
+            full_path.chmod(mode)
+
+        case (
+            AddFile(path)
+            | ModifyFile(path)
+            | AddBinary(path)
+            | ModifyBinary(path)
+            | AddSymlink(path)
+            | ModifySymlink(path)
+        ):
+            path = renames.get(path, path)
+            full_path = root / path
+
+            full_path.parent.mkdir(parents=True, exist_ok=True)
+
+            match change:
+                case AddFile(_, lines) | ModifyFile(_, lines):
+                    full_path.write_text(lines_to_text(lines))
+                case AddBinary(_, data) | ModifyBinary(_, _, data):
+                    full_path.write_bytes(data)
+                case AddSymlink(_, to) | ModifySymlink(_, _, to):
+                    full_path.symlink_to(to)
+
+            if isinstance(change, (AddFile, AddBinary)) and change.is_exec:
+                mode = full_path.stat().st_mode
+                mode |= stat.S_IXUSR
+                full_path.chmod(mode)
+
+        case DeleteFile(path) | DeleteBinary(path) | DeleteSymlink(path):
+            path = renames.get(path, path)
+            full_path = root / path
+
+            full_path.unlink()
+
+            full_path = full_path.parent
+            while full_path != root and not any(full_path.iterdir()):
+                full_path.relative_to(root)
+                full_path.rmdir()
+                full_path = full_path.parent
+
+
+def lines_to_text(lines: list[Line]) -> str:
+    return "\n".join(line.new for line in lines if line.new is not None)

jjdiff-0.1.0/src/jjdiff/cols.py

@@ -0,0 +1,13 @@
+from collections.abc import Iterable
+
+from .drawable import Drawable
+from .grid import Grid
+
+
+class Cols(Grid):
+    def __init__(self, drawables: Iterable[Drawable]):
+        drawables = tuple(drawables)
+        super().__init__(
+            tuple(1 for _ in drawables),
+            [drawables],
+        )