Added support to specify '-b branch@commit' #659
+415
−5
Conversation
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
Current implementation already allows for specifying explicit commits like '-b commit' to pin subrepo sources (i.e during subrepo clone/pull). In that case, it also sets the name of the branch in the subrepo merge commit message and inside .gitrepo file to that commit hash. This addition allows for specifying both branch and commit. During the subrepo fetch phase, the commit is checked against the specified branch. If the requested commit can be reached from the head of the requested branch, the subrepo is re-fetched to that commit. Afterwards command processing remains the same, except that given branch name is written to the subrepo clone/pull commit message and into the .gitrepo file. The commit part of the '-b branch@commit' request may be abbreviated to the reasonable extent.
|
Would you be willing to add tests for this? |
|
I could try - it'll take a while. What would be the essential test scenario(s) in your opinion? |
|
Off the top of my head:
I am probably missing some variations, but that is a good start. |
|
Thanks for the suggestion. |
When branch@commit is requested in clone, fetch and pull commands, show that in their output as well.
It does the following: 1. Clone default test repos foo and bar 2. Create a new branch bar1 in bar 3. In bar create three additional commits in bar1 4. Checkout default branch in bar (to allow for later push) 5. In foo subrepo clone of bar1@commit1 from bar 6. Test clone results 7. In foo subrepo pull of bar1@commit2 from bar 8. Test pull results 9. Make additional change in foo/bar 10. In foo subrepo push bar and test result (push fails) 11. In foo force subrepo clone bar@commit3 (last commit in bar1) 12. Re-make additional change in foo/bar 13. In foo subrepo push bar and test result (push success) 13. In foo subrepo pull bar1 from bar and test result (up to date) 14. In foo subrepo pull bar1@commit2 (fails - old commit) 15. In foo subrepo clone bar1@commit2 (fails - subrepo exists)
|
Hi, i prepared initial tests for using branch@commit. I tried to follow your test scenario suggestions:) |
|
@admorgan hi, any comments regarding proposed tests? |
|
I haven't looked really close because they are failing. Look at the output to see suggestions from shellcheck on what I believe will address most of the issues. |
|
@admorgan hi, thanks for the reply. I fixed the pre-commit check, however tests are still failing (encode.t). Not on my behalf, i believe:) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Current implementation already allows for specifying explicit commits like '-b commit' to pin subrepo sources (i.e during subrepo clone/pull). In that case, it also sets the name of the branch in the subrepo merge commit message and inside .gitrepo file to that commit hash. This addition allows for specifying both branch and commit. During the subrepo fetch phase, the commit is checked against the specified branch. If the requested commit can be reached from the head of the requested branch, the subrepo is re-fetched to that commit.
Afterwards command processing remains the same, except that given branch name is written to the subrepo clone/pull commit message and into the .gitrepo file.
The commit part of the '-b branch@commit' request may be abbreviated to the reasonable extent.