Add support for Git repos with multiple remotes configured#1782
Merged
Conversation
d1985d2 to
a207905
Compare
6441345 to
77992da
Compare
Contributor
Author
|
This one is ready for review too, @mosteo. You can ignore my previous (deleted) comment. |
77992da to
6a29f1c
Compare
Conflicts in: - src/alire/alire-publish.ads
mosteo
reviewed
Oct 24, 2024
Comment on lines
+52
to
+64
| def commit_file(commit_name: str, path: str, content: str): | ||
| """ | ||
| Create a new file with the specified content and `git commit` it. | ||
|
|
||
| Also returns the commit's hash and attaches the tag `f"tag_{commit_name}"` | ||
| thereto. | ||
| """ | ||
| with open(path, "x") as f: | ||
| f.write(content) | ||
| run(["git", "add", path]) | ||
| run(["git", "commit", "-m", f"Commit {commit_name}"]) | ||
| run(["git", "tag", f"tag_{commit_name}"]) | ||
| return git_head() |
Member
There was a problem hiding this comment.
Should this be in helpers.py named as git_commit_file, for general availability?
Contributor
Author
|
I'm assuming this is transient. |
Member
Yes it is. |
mosteo
approved these changes
Oct 29, 2024
Member
|
Merged, thanks. |
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
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.
A Git repo may have multiple remotes configured, often with different branches tracking different remotes. For example, development may be done on a private repository, with release/production versions available on a public repository.
Currently Alire assumes there is at most one remote, and therefore ends up using whichever is first alphabetically when there is more than one. In practice, this is only relevant to
alr publishing, since dependencies are always fetched as a plaingit clone, which does indeed yield a repo with only one remote.This PR makes this assumption more explicit where applicable, and adds a subprogram to
Alire.Publish.Local_Repositorywhich attempts to guess the appropriate remote when there is more than one.