-
Notifications
You must be signed in to change notification settings - Fork 25
Implement T8L1/glossary-branch-push #250
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
jovnc
merged 9 commits into
git-mastery:main
from
jiaxinnns:feature/glossary-branch-push
Feb 1, 2026
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
8af75eb
Implement setup
jiaxinnns c01c2f6
Implement verify logic
jiaxinnns 0c3706a
Add tests
jiaxinnns b22ba31
Add test code
jiaxinnns fda4352
Clean up code
jiaxinnns 90f2b02
Remove fetch
jiaxinnns 25332c4
Address PR comments
jiaxinnns f3ee3a1
Change fork repo call
jiaxinnns 0343216
Remove config
jiaxinnns File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| { | ||
| "exercise_name": "glossary-branch-push", | ||
| "tags": ["git-push"], | ||
| "requires_git": true, | ||
| "requires_github": true, | ||
| "base_files": {}, | ||
| "exercise_repo": { | ||
| "repo_type": "local", | ||
| "repo_name": "funny-glossary", | ||
| "repo_title": null, | ||
| "create_fork": null, | ||
| "init": false | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| https://git-mastery.org/lessons/remoteBranchPush/exercise-glossary-branch-push.html |
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| from exercise_utils.file import create_or_update_file | ||
| from exercise_utils.git import add, checkout, commit | ||
| from exercise_utils.github_cli import ( | ||
| clone_repo_with_gh, | ||
| delete_repo, | ||
| fork_repo, | ||
| get_github_username, | ||
| has_repo, | ||
| ) | ||
|
|
||
| REPO_OWNER = "git-mastery" | ||
| REPO_NAME = "samplerepo-funny-glossary" | ||
|
|
||
|
|
||
| def setup(verbose: bool = False): | ||
| username = get_github_username(verbose) | ||
| FORK_NAME = f"{username}-gitmastery-samplerepo-funny-glossary" | ||
|
|
||
| if has_repo(FORK_NAME, True, verbose): | ||
| delete_repo(FORK_NAME, verbose) | ||
|
|
||
| fork_repo(f"{REPO_OWNER}/{REPO_NAME}", FORK_NAME, verbose, False) | ||
|
|
||
| clone_repo_with_gh(f"https://github.com/{username}/{FORK_NAME}", verbose, ".") | ||
|
|
||
| checkout("PQR", True, verbose) | ||
|
|
||
| create_or_update_file( | ||
| "r.txt", | ||
| "refactoring: Improving the code without changing what it does... in theory.\n", | ||
| ) | ||
|
|
||
| add(["r.txt"], verbose) | ||
| commit("Add 'refactoring'", verbose) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| from contextlib import contextmanager | ||
| from typing import Iterator, Tuple | ||
|
|
||
| from exercise_utils.test import ( | ||
| GitAutograderTest, | ||
| GitAutograderTestLoader, | ||
| assert_output, | ||
| ) | ||
| from git_autograder import GitAutograderStatus | ||
| from repo_smith.repo_smith import RepoSmith | ||
|
|
||
| from .verify import PQR_BRANCH_NOT_PUSHED, verify | ||
|
|
||
| REPOSITORY_NAME = "glossary-branch-push" | ||
|
|
||
| loader = GitAutograderTestLoader(REPOSITORY_NAME, verify) | ||
|
|
||
|
|
||
| @contextmanager | ||
| def base_setup() -> Iterator[Tuple[GitAutograderTest, RepoSmith]]: | ||
| with loader.start(include_remote_repo=True) as (test, rs, rs_remote): | ||
| remote_path = str(rs_remote.repo.git_dir) | ||
| rs.git.remote_add("origin", remote_path) | ||
|
|
||
| rs.git.checkout("PQR", branch=True) | ||
| rs.files.create_or_update( | ||
| "r.txt", | ||
| "refactoring: Improving the code without changing what it does... in theory.\n", | ||
| ) | ||
| rs.git.add(all=True) | ||
| rs.git.commit(message="Add 'refactoring'") | ||
| rs.git.checkout("main") | ||
|
|
||
| yield test, rs | ||
|
|
||
|
|
||
| def test_base(): | ||
| with base_setup() as (test, rs): | ||
| rs.git.push("origin", "PQR") | ||
|
|
||
| output = test.run() | ||
| assert_output(output, GitAutograderStatus.SUCCESSFUL) | ||
|
|
||
|
|
||
| def test_pqr_not_pushed(): | ||
| with base_setup() as (test, rs): | ||
| output = test.run() | ||
| assert_output( | ||
| output, | ||
| GitAutograderStatus.UNSUCCESSFUL, | ||
| [PQR_BRANCH_NOT_PUSHED], | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| from git_autograder import ( | ||
| GitAutograderExercise, | ||
| GitAutograderOutput, | ||
| GitAutograderStatus, | ||
| ) | ||
|
|
||
| PQR_BRANCH_NOT_PUSHED = "Branch 'PQR' has not been pushed to the remote." | ||
|
|
||
|
|
||
| def verify(exercise: GitAutograderExercise) -> GitAutograderOutput: | ||
| try: | ||
| exercise.repo.repo.refs["origin/PQR"] | ||
| except (IndexError, KeyError): | ||
| raise exercise.wrong_answer([PQR_BRANCH_NOT_PUSHED]) | ||
|
|
||
| return exercise.to_output( | ||
| ["Great work pushing the PQR branch to your fork!"], | ||
| GitAutograderStatus.SUCCESSFUL, | ||
| ) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested and verified it is working as expected.