deploy: 98aabff

Author: woojiahao

branch_rename/tests/specs/indirect_rename.yml

@@ -0,0 +1,16 @@
+initialization:
+  steps:
+    - type: commit
+      empty: true
+      message: Empty commit
+      id: start
+    - type: branch
+      branch-name: login
+    - type: checkout
+      branch-name: main
+    - type: branch-rename
+      branch-name: login
+      new-name: feature/logi
+    - type: branch-rename
+      branch-name: feature/logi
+      new-name: feature/login

branch_rename/tests/specs/rename_after.yml

@@ -0,0 +1,16 @@
+initialization:
+  steps:
+    - type: commit
+      empty: true
+      message: Empty commit
+      id: start
+    - type: branch
+      branch-name: login
+    - type: checkout
+      branch-name: main
+    - type: branch-rename
+      branch-name: login
+      new-name: feature/login
+    - type: branch-rename
+      branch-name: feature/login
+      new-name: test

branch_rename/tests/test_verify.py

@@ -33,3 +33,13 @@ def test_not_rename():
         assert_output(
             output, GitAutograderStatus.UNSUCCESSFUL, [NO_RENAME_EVIDENCE_FEATURE_LOGIN]
         )
+
+
+def test_indirect_rename():
+    with loader.load("specs/indirect_rename.yml") as output:
+        assert_output(output, GitAutograderStatus.SUCCESSFUL)
+
+
+def test_rename_after():
+    with loader.load("specs/rename_after.yml") as output:
+        assert_output(output, GitAutograderStatus.UNSUCCESSFUL, [FEATURE_LOGIN_MISSING])

branch_rename/verify.py

@@ -1,3 +1,5 @@
+import re
+
 from git import Repo
 from git_autograder import (
     GitAutograderExercise,
@@ -15,15 +17,28 @@
 def branch_has_rename_evidence(
     exercise: GitAutograderExercise, new_branch: str, old_branch: str
 ) -> bool:
+    """Performs a DFS on the branch renames starting with login till feature/login.
+
+    This is necessary since the renames could be performed in parts:
+
+    login -> feat/login -> feature/login
+    """
     branch = exercise.repo.branches.branch_or_none(new_branch)
     if branch is None:
+        # If new_branch not present at all
         return False
 
-    expected = f"renamed refs/heads/{old_branch} to refs/heads/{new_branch}"
-    for entry in branch.reflog:
-        if entry.message == expected:
-            return True
-    return False
+    rename_regex = re.compile("^renamed refs/heads/(.+) to refs/heads/(.+)$")
+    for entry in branch.reflog[::-1]:
+        match_group = rename_regex.match(entry.message)
+        if match_group is None:
+            continue
+        original = match_group.group(1)
+        new = match_group.group(2)
+        if original == old_branch:
+            old_branch = new
+
+    return old_branch == new_branch
 
 
 def verify(exercise: GitAutograderExercise) -> GitAutograderOutput:

remote_branch_rename/verify.py

@@ -1,3 +1,4 @@
+import re
 from typing import List
 
 from git import Repo
@@ -27,15 +28,28 @@
 def branch_has_rename_evidence(
     exercise: GitAutograderExercise, new_branch: str, old_branch: str
 ) -> bool:
+    """Performs a DFS on the branch renames starting with login till feature/login.
+
+    This is necessary since the renames could be performed in parts:
+
+    login -> feat/login -> feature/login
+    """
     branch = exercise.repo.branches.branch_or_none(new_branch)
     if branch is None:
+        # If new_branch not present at all
         return False
 
-    expected = f"renamed refs/heads/{old_branch} to refs/heads/{new_branch}"
-    for entry in branch.reflog:
-        if entry.message == expected:
-            return True
-    return False
+    rename_regex = re.compile("^renamed refs/heads/(.+) to refs/heads/(.+)$")
+    for entry in branch.reflog[::-1]:
+        match_group = rename_regex.match(entry.message)
+        if match_group is None:
+            continue
+        original = match_group.group(1)
+        new = match_group.group(2)
+        if original == old_branch:
+            old_branch = new
+
+    return old_branch == new_branch
 
 
 def fetch_remotes(repo: Repo) -> None: