git2svn 0.6.0__tar.gz → 0.6.1__tar.gz

{git2svn-0.6.0/git2svn.egg-info → git2svn-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git2svn
-Version: 0.6.0
+Version: 0.6.1
 Summary: CLI utility to synchronize changes from a local Git repository to a local SVN working copy
 Author: Simon
 License: Apache-2.0

{git2svn-0.6.0 → git2svn-0.6.1}/git2svn/_version.py

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

{git2svn-0.6.0 → git2svn-0.6.1}/git2svn/cli.py

@@ -473,6 +473,11 @@ def main(argv: Optional[List[str]] = None) -> int:
 
     try:
         if args.command == "stage":
+            is_snapshot = getattr(args, "snapshot", False)
+            if not ref1 and is_snapshot:
+                ref1 = "HEAD"
+                logger.info("No ref specified for snapshot stage; defaulting to HEAD.")
+
             if not ref1:
                 print(
                     "Error: stage requires a commit or range (e.g. 'git2svn stage main..feature') "
@@ -484,7 +489,7 @@ def main(argv: Optional[List[str]] = None) -> int:
                 ref1,
                 ref2,
                 use_copy=use_copy,
-                snapshot=getattr(args, "snapshot", False),
+                snapshot=is_snapshot,
             )
         elif args.command == "replay":
             action = getattr(args, "replay_action", None)

{git2svn-0.6.0 → git2svn-0.6.1}/git2svn/core.py

@@ -71,7 +71,10 @@ class Synchronizer:
         If use_copy=True, brute-force copies files using Git object DB (bypassing patch).
         """
         if snapshot:
-            self.stage_snapshot(ref1)
+            # If a range was supplied (e.g. origin/main..main or ref1 and ref2), snapshot targets the end ref
+            is_single, start_or_commit, end_ref = parse_ref_arguments(ref1, ref2)
+            target_ref = end_ref if not is_single and end_ref else start_or_commit
+            self.stage_snapshot(target_ref)
             return
 
         is_single, start_or_commit, end_ref = parse_ref_arguments(ref1, ref2)

{git2svn-0.6.0 → git2svn-0.6.1/git2svn.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git2svn
-Version: 0.6.0
+Version: 0.6.1
 Summary: CLI utility to synchronize changes from a local Git repository to a local SVN working copy
 Author: Simon
 License: Apache-2.0

{git2svn-0.6.0 → git2svn-0.6.1}/pyproject.toml

@@ -98,7 +98,7 @@ disallow_incomplete_defs = true
 check_untyped_defs = true
 no_implicit_optional = true
 warn_redundant_casts = true
-warn_unused_ignores = true
+warn_unused_ignores = false
 warn_return_any = true
 show_error_codes = true
 

{git2svn-0.6.0 → git2svn-0.6.1}/tests/test_e2e.py

@@ -233,6 +233,27 @@ class TestGit2SvnE2E(unittest.TestCase):
         self.assertIn("D       obsolete.txt", status)
         self.assertIn("A       brand_new.txt", status)
 
+    def test_e2e_snapshot_with_default_range(self):
+        """Test snapshot stage correctly resolves target ref when defaultRange is a range (e.g. origin/main..main)."""
+        # Create base file in SVN
+        (self.svn_wc_dir / "base.txt").write_text("v1\n", encoding="utf-8")
+        subprocess.run([SVN_BIN, "add", "base.txt"], cwd=self.svn_wc_dir, check=True)
+        subprocess.run([SVN_BIN, "commit", "-m", "init"], cwd=self.svn_wc_dir, check=True)
+
+        # In Git, create base commit and feature commit
+        (self.git_dir / "base.txt").write_text("v1\n", encoding="utf-8")
+        c1 = self._git_commit("feat: c1")
+        (self.git_dir / "base.txt").write_text("v2\n", encoding="utf-8")
+        c2 = self._git_commit("feat: c2")
+
+        # Configure defaultRange as a range c1..c2
+        subprocess.run([GIT_BIN, "config", "git2svn.defaultRange", f"{c1}..{c2}"], cwd=self.git_dir, check=True)
+
+        # Run stage --snapshot without any ref (should use end ref of defaultRange: c2)
+        exit_code = cli_main(["stage", "--snapshot", "-g", str(self.git_dir), "-s", str(self.svn_wc_dir)])
+        self.assertEqual(exit_code, 0)
+        self.assertEqual((self.svn_wc_dir / "base.txt").read_text(encoding="utf-8"), "v2\n")
+
     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