git2svn 0.5.0__tar.gz → 0.5.1__tar.gz

{git2svn-0.5.0 → git2svn-0.5.1}/.github/workflows/ci.yml

@@ -65,7 +65,9 @@ jobs:
           echo "C:\Program Files\TortoiseSVN\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
       - name: Install Dependencies
-        run: pip install -e .[dev]
+        run: |
+          python -m pip install --upgrade pip setuptools wheel
+          pip install --retries 5 -e .[dev]
 
       - name: Run Unit & Integration Tests (with Coverage)
         if: runner.os == 'Linux' && matrix.python-version == '3.12'

{git2svn-0.5.0/git2svn.egg-info → git2svn-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git2svn
-Version: 0.5.0
+Version: 0.5.1
 Summary: CLI utility to synchronize changes from a local Git repository to a local SVN working copy
 Author: Simon
 License: Apache-2.0
@@ -35,7 +35,7 @@ Dynamic: license-file
 <p align="center">
   <a href="https://github.com/simon123h/git2svn/actions/workflows/ci.yml"><img src="https://github.com/simon123h/git2svn/actions/workflows/ci.yml/badge.svg?branch=main" alt="Build Status"></a>
   <a href="https://codecov.io/gh/simon123h/git2svn"><img src="https://codecov.io/gh/simon123h/git2svn/branch/main/graph/badge.svg" alt="Coverage"></a>
-  <a href="https://pypi.org/project/git2svn/"><img src="https://img.shields.io/pypi/v/git2svn?color=blue" alt="PyPI Version"></a>
+  <a href="https://pypi.org/project/git2svn/"><img src="https://img.shields.io/pypi/v/git2svn?color=green" alt="PyPI Version"></a>
   <img src="https://img.shields.io/badge/Python-v3.11+-3776AB?logo=python&logoColor=white" alt="Python Version">
   <img src="https://img.shields.io/endpoint?url=https%3A%2F%2Ftokei.kojix2.net%2Fbadge%2Fgithub%2Fsimon123h%2Fgit2svn%2Flines" alt="Lines of Code">
   <a href="https://github.com/simon123h/git2svn/releases"><img src="https://badgen.net/github/release/simon123h/git2svn?color=orange" alt="Latest Release"></a>

{git2svn-0.5.0 → git2svn-0.5.1}/README.md

@@ -3,7 +3,7 @@
 <p align="center">
   <a href="https://github.com/simon123h/git2svn/actions/workflows/ci.yml"><img src="https://github.com/simon123h/git2svn/actions/workflows/ci.yml/badge.svg?branch=main" alt="Build Status"></a>
   <a href="https://codecov.io/gh/simon123h/git2svn"><img src="https://codecov.io/gh/simon123h/git2svn/branch/main/graph/badge.svg" alt="Coverage"></a>
-  <a href="https://pypi.org/project/git2svn/"><img src="https://img.shields.io/pypi/v/git2svn?color=blue" alt="PyPI Version"></a>
+  <a href="https://pypi.org/project/git2svn/"><img src="https://img.shields.io/pypi/v/git2svn?color=green" alt="PyPI Version"></a>
   <img src="https://img.shields.io/badge/Python-v3.11+-3776AB?logo=python&logoColor=white" alt="Python Version">
   <img src="https://img.shields.io/endpoint?url=https%3A%2F%2Ftokei.kojix2.net%2Fbadge%2Fgithub%2Fsimon123h%2Fgit2svn%2Flines" alt="Lines of Code">
   <a href="https://github.com/simon123h/git2svn/releases"><img src="https://badgen.net/github/release/simon123h/git2svn?color=orange" alt="Latest Release"></a>

{git2svn-0.5.0 → git2svn-0.5.1}/git2svn/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.5.0'
-__version_tuple__ = version_tuple = (0, 5, 0)
+__version__ = version = '0.5.1'
+__version_tuple__ = version_tuple = (0, 5, 1)
 
 __commit_id__ = commit_id = None

{git2svn-0.5.0 → git2svn-0.5.1}/git2svn/git.py

@@ -218,15 +218,15 @@ class GitRepo:
             return res.stdout.strip()
         return None
 
-    def get_diff(self, ref_spec: str) -> str:
-        """Get unified diff for the given reference specification."""
-        res = self.run_cmd(["diff", "--binary", ref_spec])
+    def get_diff(self, ref_spec: str) -> bytes:
+        """Get unified diff for the given reference specification as raw bytes."""
+        res = self.run_cmd_bytes(["diff", "--binary", ref_spec])
         return res.stdout
 
-    def get_diff_root(self, commit_hash: str) -> str:
-        """Get unified diff for a root commit."""
+    def get_diff_root(self, commit_hash: str) -> bytes:
+        """Get unified diff for a root commit as raw bytes."""
         empty_tree_hash = "4b825dc642cb6eb9a060e54bf8d69288fbee4904"
-        res = self.run_cmd(["diff", "--binary", empty_tree_hash, commit_hash])
+        res = self.run_cmd_bytes(["diff", "--binary", empty_tree_hash, commit_hash])
         return res.stdout
 
     def get_name_status(self, ref_spec: str) -> List[FileChange]:

{git2svn-0.5.0 → git2svn-0.5.1}/git2svn/patcher.py

@@ -4,6 +4,7 @@ import logging
 import subprocess
 import sys
 from pathlib import Path
+from typing import Union
 
 logger = logging.getLogger("git2svn")
 
@@ -16,43 +17,49 @@ class Patcher:
         self.git_bin = git_bin
         self.dry_run = dry_run
 
-    def apply_diff(self, diff_content: str) -> None:
-        """Apply unified diff text to target_dir using git apply."""
-        if not diff_content.strip():
+    def apply_diff(self, diff_content: Union[str, bytes]) -> None:
+        """Apply unified diff text or bytes to target_dir using git apply."""
+        if isinstance(diff_content, str):
+            diff_bytes = diff_content.encode("utf-8")
+        else:
+            diff_bytes = diff_content
+
+        if not diff_bytes.strip():
             logger.info("Diff is empty. Nothing to patch.")
             return
 
         cmd = [self.git_bin, "apply", "--ignore-whitespace", "--unsafe-paths", "--reject"]
         if self.dry_run:
-            print(f"[DRY-RUN] (in {self.target_dir}) {' '.join(cmd)} << EOF\n{diff_content.strip()[:200]}...\nEOF")
+            preview = diff_bytes.strip()[:200].decode("utf-8", errors="replace")
+            print(f"[DRY-RUN] (in {self.target_dir}) {' '.join(cmd)} << EOF\n{preview}...\nEOF")
             return
 
         logger.debug("Applying patch to %s using %s", self.target_dir, " ".join(cmd))
         proc = subprocess.run(
             cmd,
             cwd=self.target_dir,
-            input=diff_content,
+            input=diff_bytes,
             capture_output=True,
-            text=True,
-            encoding="utf-8",
-            errors="replace",
         )
 
+        stdout_str = proc.stdout.decode("utf-8", errors="replace") if proc.stdout else ""
+        stderr_str = proc.stderr.decode("utf-8", errors="replace") if proc.stderr else ""
+
         if proc.returncode != 0:
             logger.error(
-                "git apply failed with code %d:\nSTDOUT:\n%s\nSTDERR:\n%s", proc.returncode, proc.stdout, proc.stderr
+                "git apply failed with code %d:\nSTDOUT:\n%s\nSTDERR:\n%s", proc.returncode, stdout_str, stderr_str
             )
             print(f"Error: git apply failed (exit code {proc.returncode}).", file=sys.stderr)
-            if proc.stdout:
-                print(proc.stdout, file=sys.stderr)
-            if proc.stderr:
-                print(proc.stderr, file=sys.stderr)
+            if stdout_str:
+                print(stdout_str, file=sys.stderr)
+            if stderr_str:
+                print(stderr_str, file=sys.stderr)
             print(
                 "Tip: Check for .rej reject files in the SVN workspace or use 'git2svn stage --copy' to copy files directly.",
                 file=sys.stderr,
             )
-            raise subprocess.CalledProcessError(proc.returncode, cmd, proc.stdout, proc.stderr)
+            raise subprocess.CalledProcessError(proc.returncode, cmd, stdout_str, stderr_str)
         else:
-            if proc.stdout or proc.stderr:
-                msg = (proc.stdout + "\n" + proc.stderr).strip()
+            if stdout_str or stderr_str:
+                msg = (stdout_str + "\n" + stderr_str).strip()
                 logger.info("Patch applied successfully:\n%s", msg)

{git2svn-0.5.0 → git2svn-0.5.1/git2svn.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git2svn
-Version: 0.5.0
+Version: 0.5.1
 Summary: CLI utility to synchronize changes from a local Git repository to a local SVN working copy
 Author: Simon
 License: Apache-2.0
@@ -35,7 +35,7 @@ Dynamic: license-file
 <p align="center">
   <a href="https://github.com/simon123h/git2svn/actions/workflows/ci.yml"><img src="https://github.com/simon123h/git2svn/actions/workflows/ci.yml/badge.svg?branch=main" alt="Build Status"></a>
   <a href="https://codecov.io/gh/simon123h/git2svn"><img src="https://codecov.io/gh/simon123h/git2svn/branch/main/graph/badge.svg" alt="Coverage"></a>
-  <a href="https://pypi.org/project/git2svn/"><img src="https://img.shields.io/pypi/v/git2svn?color=blue" alt="PyPI Version"></a>
+  <a href="https://pypi.org/project/git2svn/"><img src="https://img.shields.io/pypi/v/git2svn?color=green" alt="PyPI Version"></a>
   <img src="https://img.shields.io/badge/Python-v3.11+-3776AB?logo=python&logoColor=white" alt="Python Version">
   <img src="https://img.shields.io/endpoint?url=https%3A%2F%2Ftokei.kojix2.net%2Fbadge%2Fgithub%2Fsimon123h%2Fgit2svn%2Flines" alt="Lines of Code">
   <a href="https://github.com/simon123h/git2svn/releases"><img src="https://badgen.net/github/release/simon123h/git2svn?color=orange" alt="Latest Release"></a>

{git2svn-0.5.0 → git2svn-0.5.1}/tests/test_e2e.py

@@ -232,3 +232,151 @@ class TestGit2SvnE2E(unittest.TestCase):
         status = self._svn_status()
         self.assertIn("D       obsolete.txt", status)
         self.assertIn("A       brand_new.txt", status)
+
+    def test_e2e_replay_conflict_pause_and_continue(self):
+        """Test replay pausing on a patch conflict in a real SVN WC and resuming with --continue."""
+        # 1. Base commit in Git and SVN
+        f_git = self.git_dir / "conflict_target.txt"
+        f_git.write_text("line 1\nline 2\nline 3\n", encoding="utf-8")
+        base_hash = self._git_commit("base: conflict target")
+
+        (self.svn_wc_dir / "conflict_target.txt").write_text("line 1\nline 2\nline 3\n", encoding="utf-8")
+        subprocess.run([SVN_BIN, "add", "conflict_target.txt"], cwd=self.svn_wc_dir, check=True)
+        subprocess.run([SVN_BIN, "commit", "-m", "init conflict target"], cwd=self.svn_wc_dir, check=True)
+
+        # 2. Modify in SVN out-of-band to cause conflict
+        (self.svn_wc_dir / "conflict_target.txt").write_text("line 1 DIFFERENT\nline 2\nline 3\n", encoding="utf-8")
+        subprocess.run([SVN_BIN, "commit", "-m", "remote edit in svn"], cwd=self.svn_wc_dir, check=True)
+        subprocess.run([SVN_BIN, "update"], cwd=self.svn_wc_dir, check=True)
+
+        # 3. Git commit 1 (touches line 1 and 2, which conflicts)
+        f_git.write_text("line 1 GIT_EDIT\nline 2 GIT_EDIT\nline 3\n", encoding="utf-8")
+        self._git_commit("feat: conflicting git commit")
+
+        # 4. Git commit 2 (subsequent non-conflicting commit)
+        f_next = self.git_dir / "subsequent.txt"
+        f_next.write_text("subsequent content\n", encoding="utf-8")
+        c2_hash = self._git_commit("feat: subsequent commit")
+
+        # 5. Run replay range - should pause with non-zero exit code due to conflict
+        exit_code = cli_main(["replay", f"{base_hash}..{c2_hash}", "-g", str(self.git_dir), "-s", str(self.svn_wc_dir)])
+        self.assertNotEqual(exit_code, 0)
+
+        # Verify .rej artifact exists
+        rej_file = self.svn_wc_dir / "conflict_target.txt.rej"
+        self.assertTrue(rej_file.exists())
+
+        # 6. Resolve conflict manually in SVN working copy and remove .rej artifact
+        (self.svn_wc_dir / "conflict_target.txt").write_text(
+            "line 1 RESOLVED\nline 2 GIT_EDIT\nline 3\n", encoding="utf-8"
+        )
+        rej_file.unlink()
+
+        # 7. Continue replay
+        cont_code = cli_main(["replay", "--continue", "-g", str(self.git_dir), "-s", str(self.svn_wc_dir)])
+        self.assertEqual(cont_code, 0)
+
+        # Verify SVN working copy is clean and both commits are in SVN log
+        self.assertEqual(self._svn_status().strip(), "")
+        _, full_log = self._svn_log_messages()
+        self.assertIn("conflicting git commit", full_log)
+        self.assertIn("subsequent commit", full_log)
+
+        # Verify final files on disk in SVN
+        self.assertEqual(
+            (self.svn_wc_dir / "conflict_target.txt").read_text(encoding="utf-8"),
+            "line 1 RESOLVED\nline 2 GIT_EDIT\nline 3\n",
+        )
+        self.assertEqual((self.svn_wc_dir / "subsequent.txt").read_text(encoding="utf-8"), "subsequent content\n")
+
+    def test_e2e_file_renames_and_moves(self):
+        """Test replay correctly handles file renames and moves across directories in real SVN."""
+        # 1. Base commit: create src/old_name.txt
+        src_dir = self.git_dir / "src"
+        src_dir.mkdir()
+        orig_file = src_dir / "old_name.txt"
+        orig_file.write_text("print('hello rename')\n", encoding="utf-8")
+        base_hash = self._git_commit("init: original file")
+
+        # Replay base to SVN
+        code_base = cli_main(["replay", base_hash, "-g", str(self.git_dir), "-s", str(self.svn_wc_dir)])
+        self.assertEqual(code_base, 0)
+
+        # 2. Git commit: rename src/old_name.txt -> src/nested/renamed.txt
+        nested_dir = src_dir / "nested"
+        nested_dir.mkdir()
+        subprocess.run([GIT_BIN, "mv", "src/old_name.txt", "src/nested/renamed.txt"], cwd=self.git_dir, check=True)
+        rename_hash = self._git_commit("refactor: move and rename file")
+
+        # 3. Replay rename commit to SVN
+        code_rename = cli_main(
+            ["replay", f"{base_hash}..{rename_hash}", "-g", str(self.git_dir), "-s", str(self.svn_wc_dir)]
+        )
+        self.assertEqual(code_rename, 0)
+
+        # 4. Verify SVN state
+        self.assertFalse((self.svn_wc_dir / "src" / "old_name.txt").exists())
+        renamed_svn = self.svn_wc_dir / "src" / "nested" / "renamed.txt"
+        self.assertTrue(renamed_svn.is_file())
+        self.assertEqual(renamed_svn.read_text(encoding="utf-8"), "print('hello rename')\n")
+        self.assertEqual(self._svn_status().strip(), "")
+
+    def test_e2e_binary_files(self):
+        """Test replay correctly handles adding and modifying binary files with null bytes in real SVN."""
+        # 1. Root commit
+        (self.git_dir / "init.txt").write_text("init\n")
+        root_hash = self._git_commit("init: root commit")
+
+        # Replay root commit to SVN
+        code_root = cli_main(["replay", root_hash, "-g", str(self.git_dir), "-s", str(self.svn_wc_dir)])
+        self.assertEqual(code_root, 0)
+
+        # 2. Add binary file
+        bin_git = self.git_dir / "image.bin"
+        initial_bytes = bytes([0x00, 0xFF, 0xFE, 0x01, 0x00, 0x42, 0xAA, 0x55] * 32)
+        bin_git.write_bytes(initial_bytes)
+        self._git_commit("feat: add binary image")
+
+        # 3. Modify binary file
+        modified_bytes = bytes([0x00, 0x00, 0xFF, 0xEE, 0xDD, 0xCC, 0xBB, 0xAA] * 40)
+        bin_git.write_bytes(modified_bytes)
+        mod_hash = self._git_commit("fix: update binary bytes")
+
+        # 4. Replay range to SVN
+        code = cli_main(["replay", f"{root_hash}..{mod_hash}", "-g", str(self.git_dir), "-s", str(self.svn_wc_dir)])
+        self.assertEqual(code, 0)
+
+        # 4. Verify SVN file content is bit-for-bit identical
+        bin_svn = self.svn_wc_dir / "image.bin"
+        self.assertTrue(bin_svn.is_file())
+        self.assertEqual(bin_svn.read_bytes(), modified_bytes)
+        self.assertEqual(self._svn_status().strip(), "")
+
+    def test_e2e_status_real_repo(self):
+        """Test git2svn status command execution against real Git and real SVN repositories."""
+        # Setup base commit in Git and SVN
+        f = self.git_dir / "status_test.txt"
+        f.write_text("status test\n", encoding="utf-8")
+        base_hash = self._git_commit("init: status test file")
+
+        cli_main(["replay", base_hash, "-g", str(self.git_dir), "-s", str(self.svn_wc_dir)])
+
+        # Setup pending commit in Git
+        f.write_text("status test modified\n", encoding="utf-8")
+        pending_hash = self._git_commit("feat: pending feature for status")
+
+        # Configure defaultRange and svnDir in Git config
+        subprocess.run(
+            [GIT_BIN, "config", "git2svn.defaultRange", f"{base_hash}..{pending_hash}"],
+            cwd=self.git_dir,
+            check=True,
+        )
+        subprocess.run(
+            [GIT_BIN, "config", "git2svn.svnDir", str(self.svn_wc_dir)],
+            cwd=self.git_dir,
+            check=True,
+        )
+
+        # Run git2svn status
+        exit_code = cli_main(["status", "-g", str(self.git_dir)])
+        self.assertEqual(exit_code, 0)