Resolves "gitdist: Add Default Development Branch Support #236
Conversation
This file contains 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
0862ea8 to
b217637
Compare
b217637 to
432f3aa
Compare
Here's an initial implementation that allows a user to add default development branches to the .gitdist file in the form . master otherRepo develop thirdRepo master If those default development branches aren't specified, master is assumed. The user can then pass _DEFAULT_BRANCH_ to any command that accepts a reference and gitdist should replace _DEFAULT_BRANCH_ with the appropriate branch from the .gitdist file. The documentation for this feature can be accessed with --dist-help=default-branch.
432f3aa to
b7fdc87
Compare
|
@bartlettroscoe, I'm pretty sure the work on this PR is finished now. |
|
@jmgate, okay, I will take a look. Thanks! |
I also moved 'default-branch' before 'usage-tips' because I think that is a more natural order, expecially for --dist-help=all.
|
The changes to gitdist.py look great; very clean. The unit tests look excellent. I did not even bother trying to manually test this myself. I have little doubt that this is working correctly from just looking at the unit tests. I think this is a nice feature to add to the script. I added some commits to make some small tweaks to the documentation and add --dist-help=default-branch output to the TriBITS developers guide. If these changes look okay to you, then I can go ahead and merge and push this branch. Thanks for doing all of this! |
|
Yup, that all looks fine to me. Thanks @bartlettroscoe. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Here's an initial implementation that allows a user to pass
_DEFAULT_BRANCH_to any command that would normally take a reference (branch, tag, SHA1). Users can set up their.gitdistfile as follows:The lines of the file are read and then split on spaces. The first entry is the path to the repo
gitdistwill be working with. If there is a second entry, that will be substituted any time_DEFAULT_BRANCH_is used on the command line. If no second entry exists, themasterbranch is assumed.This allows for the following workflow:
There may be a better way to implement this, but this at least gets us started.
Closes #235