Hands-on: Fetch and merge from a remote #99
Conversation
woojiahao
left a comment
woojiahao
left a comment
There was a problem hiding this comment.
Left some minor nits about coding convention!
hands_on/fetch_merge.py
Outdated
| from exercise_utils.gitmastery import create_start_tag | ||
|
|
||
| __requires_git__ = True | ||
| __requires_github__ = True |
There was a problem hiding this comment.
If you're not using gh, you don't need this to be set to true
| __requires_github__ = True | |
| __requires_github__ = False |
hands_on/fetch_merge.py
Outdated
|
|
||
| def download(verbose: bool): | ||
| os.makedirs("samplerepo-finances") | ||
| # Clone the samplerepo-finances repo |
There was a problem hiding this comment.
| # Clone the samplerepo-finances repo |
hands_on/fetch_merge.py
Outdated
| # Clone the samplerepo-finances repo | ||
| run_command(["git", "clone", "https://github.com/git-mastery/samplerepo-finances.git"], verbose) | ||
| os.chdir("samplerepo-finances") | ||
| # Change the remote origin to point to samplerepo-finances-2 |
There was a problem hiding this comment.
| # Change the remote origin to point to samplerepo-finances-2 |
hands_on/fetch_merge.py
Outdated
|
|
||
| pass |
There was a problem hiding this comment.
| pass |
once the function behavior is populated, you are free to remove pass
|
@woojiahao understood, implemented suggested changes in latest commit. |
hands_on/fetch_merge.py
Outdated
| os.makedirs("samplerepo-finances") | ||
| run_command(["git", "clone", "https://github.com/git-mastery/samplerepo-finances.git"], verbose) | ||
| os.chdir("samplerepo-finances") |
There was a problem hiding this comment.
I don't think this set of steps are necessary. If you run clone_repo_with_git, it should produce the folder you need.
| os.makedirs("samplerepo-finances") | |
| run_command(["git", "clone", "https://github.com/git-mastery/samplerepo-finances.git"], verbose) | |
| os.chdir("samplerepo-finances") | |
| clone_repo_with_git("https://github.com/git-mastery/samplerepo-finances.git", verbose) | |
| os.chdir("samplerepo-finances") |
There was a problem hiding this comment.
Changed, new version uses clone_repo_with_git function.
hands_on/fetch_merge.py
Outdated
| os.makedirs("samplerepo-finances") | ||
| run_command(["git", "clone", "https://github.com/git-mastery/samplerepo-finances.git"], verbose) | ||
| os.chdir("samplerepo-finances") | ||
| run_command(["git", "remote", "set-url", "origin", "https://github.com/git-mastery/samplerepo-finances-2.git"], verbose) |
There was a problem hiding this comment.
There was a problem hiding this comment.
Was not able to recreate the output in https://nus-cs2103-ay2526s1.github.io/website/book/gitAndGithub/pull/ exactly using add_remote and remove remote. Falling back to run_command instead.
|
Hi @LeeZeHao, is this PR currently being worked on? Would be good to get an update by 9 Dec, else we need to close this PR, so that we can resolve this issue. Thanks! |
|
@jovnc @woojiahao I have made the latest commits. |
| "https://github.com/git-mastery/samplerepo-finances.git", verbose | ||
| ) | ||
| os.chdir("samplerepo-finances") | ||
| run_command( |
There was a problem hiding this comment.
You can use this instead from exercise_utils.git
remove_remote("origin", verbose)
add_remote("origin", "https://github.com/git-mastery/samplerepo-finances-2", verbose)
This is equivalent to a set-url. Alternatively, you can create a new utility to do this under exercise-utils but that may be unnecessary.
This is a similar merged PR #116
3 participants
Exercise Review
Exercise Discussion
#86
Checklist
Git-Masteryorganization, have you created a request for it?repo-smithto validate the exercise grading scheme?test-download.sh?git-autograder?app?