Fix crashes on @ sign in branch names

Author: PawelLipski

RELEASE_NOTES.md

@@ -2,6 +2,7 @@
 
 ## New in git-machete 3.36.4
 
+- fixed: git-machete no longer crashing when branch name contains a `@` (reported by @brandtdaniels)
 - improved: more GitHub PR description template files are recognized (like `.github/PULL_REQUEST_TEMPLATE.md` or `docs/pull_request_template.md`)
 
 ## New in git-machete 3.36.3

git_machete/git_operations.py

@@ -684,10 +684,11 @@ def get_counterpart_branches() -> Iterator[str]:
                 raise UnexpectedMacheteException(
                     f"`git reflog` did not return exactly 3 values: `{values}` ({hex_repr(entry)})")
             selector, hash, subject = values
-            branch_and_index = selector.split("@")
+            # Let's split just on the rightmost `@` in case the branch name contains a `@`
+            branch_and_index = selector.rsplit("@", 1)
             if len(branch_and_index) != 2:
                 raise UnexpectedMacheteException(
-                    f"`git reflog` did not return exactly 2 values: `{values}` ({hex_repr(entry)})")
+                    f"`branch@index` from `git reflog` did not rsplit into exactly 2 values: `{branch_and_index}` ({hex_repr(entry)})")
             branch, _ = branch_and_index
             any_branch_name = AnyBranchName.of(branch)
             if any_branch_name not in self.__reflogs_cached:

tests/test_git_operations.py

@@ -187,3 +187,13 @@ def test_get_reflog_when_log_showsignature_is_true(self) -> None:
         # If the bug reported in GitHub issue #1286 is not fixed, this method call
         # should raise an UnexpectedMacheteException.
         git.get_reflog(AnyBranchName.of("feature"))
+
+    def test_get_reflog_for_branch_with_at_sign(self) -> None:
+        create_repo()
+        new_branch("feature@foo")
+        commit("feature commit")
+
+        git = GitContext()
+        # If the bug reported in GitHub issue #1481 is not fixed, this method call
+        # should raise an UnexpectedMacheteException.
+        git.get_reflog(AnyBranchName.of("feature@foo"))

tests/test_status.py

@@ -735,17 +735,18 @@ def test_status_during_side_effecting_operations(self) -> None:
         create_repo()
         new_branch("master")
         commit()
-        new_branch("develop")
+        # Let's also see how a branch with `@` in its name is handled in various context (issue #1481).
+        new_branch("develop@foo")
         add_file_and_commit("1.txt", "some-content")
         check_out("master")
         new_branch("feature")
         add_file_and_commit("1.txt", "some-other-content")
-        check_out("develop")
+        check_out("develop@foo")
 
         body: str = \
             """
             master
-                develop
+                develop@foo
             """
         rewrite_branch_layout_file(body)
 
@@ -759,7 +760,7 @@ def test_status_during_side_effecting_operations(self) -> None:
             master
             |
             | Some commit message.
-            o-GIT AM IN PROGRESS develop *
+            o-GIT AM IN PROGRESS develop@foo *
             """
         )
         assert_success(['status', '-l'], expected_status_output)
@@ -775,7 +776,7 @@ def test_status_during_side_effecting_operations(self) -> None:
             master
             |
             | Some commit message.
-            o-CHERRY-PICKING develop *
+            o-CHERRY-PICKING develop@foo *
             """
         )
         assert_success(['status', '-l'], expected_status_output)
@@ -791,7 +792,7 @@ def test_status_during_side_effecting_operations(self) -> None:
             master
             |
             | Some commit message.
-            o-MERGING develop *
+            o-MERGING develop@foo *
             """
         )
         assert_success(['status', '-l'], expected_status_output)
@@ -807,7 +808,7 @@ def test_status_during_side_effecting_operations(self) -> None:
             master
             |
             | Some commit message.
-            o-REVERTING develop *
+            o-REVERTING develop@foo *
             """
         )
         assert_success(['status', '-l'], expected_status_output)
@@ -829,7 +830,7 @@ def test_status_during_side_effecting_operations(self) -> None:
             | Some commit message.
             | Another commit message.
             | Yet another commit message.
-            o-BISECTING develop *
+            o-BISECTING develop@foo *
             """
         )
         assert_success(['status', '-l'], expected_status_output)