44 GitAutograderStatus ,
55)
66
7- SQUASH_NOT_USED = (
8- "You should be using squash merge, not regular merge."
9- )
7+ SQUASH_NOT_USED = "You should be using squash merge, not regular merge."
108
11- MAIN_COMMITS_INCORRECT = (
12- "The main branch does not contain at least one of these commits: 'Add Joey', 'Add Phoebe' or 'Add Ross'."
13- )
9+ MAIN_COMMITS_INCORRECT = "The main branch does not contain at least one of these commits: 'Add Joey', 'Add Phoebe' or 'Add Ross'."
1410
1511CHANGES_FROM_SUPPORTING_NOT_PRESENT = (
1612 "The main branch does not contain both files 'mike.txt' and 'janice.txt'."
1713)
1814
19- SQUASH_NOT_COMMITTED = (
20- "You have not committed the staged files! Remember, you need to manually commit after a squash merge!"
21- )
15+ SQUASH_NOT_COMMITTED = "You have not committed the staged files! Remember, you need to manually commit after a squash merge!"
2216
23- SQUASH_ON_SUPPORTING = (
24- "You are working on the wrong branch! Bring the changes from supporting onto main, not the other way around."
25- )
17+ SQUASH_ON_SUPPORTING = "You are working on the wrong branch! Bring the changes from supporting onto main, not the other way around."
2618
2719
2820def verify (exercise : GitAutograderExercise ) -> GitAutograderOutput :
@@ -36,7 +28,9 @@ def verify(exercise: GitAutograderExercise) -> GitAutograderOutput:
3628 if janice_file is None :
3729 raise exercise .wrong_answer ([CHANGES_FROM_SUPPORTING_NOT_PRESENT ])
3830
39- commit_messages_in_main = [str (c .commit .message .strip ()) for c in main_branch .commits ]
31+ commit_messages_in_main = [
32+ str (c .commit .message .strip ()) for c in main_branch .commits
33+ ]
4034 merge_commits = [c for c in main_branch .commits if len (c .parents ) > 1 ]
4135
4236 if merge_commits :
@@ -56,4 +50,6 @@ def verify(exercise: GitAutograderExercise) -> GitAutograderOutput:
5650 except KeyError :
5751 pass
5852
59- return exercise .to_output (["Good job performing a merge squash!" ], GitAutograderStatus .SUCCESSFUL )
53+ return exercise .to_output (
54+ ["Good job performing a merge squash!" ], GitAutograderStatus .SUCCESSFUL
55+ )
0 commit comments