[pull] Implement pull <git> #1061
Merged
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
savil
approved these changes
May 30, 2023
savil
reviewed
May 30, 2023
internal/boxcli/pull.go
Outdated
|
|
||
| cmd.Flags().BoolVarP( | ||
| &flags.force, "force", "f", false, | ||
| "Force overwrite of existing global config files", |
There was a problem hiding this comment.
drop global and make singular file?
There was a problem hiding this comment.
Will do. I've been adding [global] to indicate optionality.
internal/boxcli/pull.go
Outdated
Comment on lines
51
to
54
| path, err := ensureGlobalConfig(cmd) | ||
| if err != nil { | ||
| return errors.WithStack(err) | ||
| } |
There was a problem hiding this comment.
how should we refactor this call so that it is applicable to non-global use-case as well?
There was a problem hiding this comment.
This should not be here, global parent command already does this. Will remove.
internal/boxcli/pull.go
Outdated
| return errors.WithStack(err) | ||
| } | ||
|
|
||
| err = box.PullGlobal(cmd.Context(), overwrite, pullPath) |
There was a problem hiding this comment.
lets rename PullGlobal to just Pull
There was a problem hiding this comment.
Yep, was on my todo.
|
@savil FYI, the implementation changed a bit (now simpler). We don't create git repos, we just copy the content to avoid keeping any state. |
mikeland73
added a commit
that referenced
this pull request
Jun 1, 2023
## Summary Stacked on #1061 This allows users to push global config (and any other files) to a repo. Pushing applies the current global profile on top of the latest commit in the repo (clone, commit, and push). It does not require force because it always applies on the latest commit. ## How was it tested? ```bash devbox global pull git@github.com:mikeland86/global.git devbox global push git@github.com:mikeland86/global.git devbox global add curl devbox global push git@github.com:mikeland86/global.git ```
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.
Summary
This implements
devbox global pull <git>and offers familiar--forceflag to overwrite conflicts.Existing functionality change:
It also changes the behavior of existing
pull <url>andpull <local-path>to also warn and overwrite on--forceinstead of merging. We do this to standardize behavior.How was it tested?