-
Notifications
You must be signed in to change notification settings - Fork 22
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Cobra migration #40
Open
hvihvi
wants to merge
16
commits into
master
Choose a base branch
from
cobra_migration
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Cobra migration #40
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
hvihvi
force-pushed
the
cobra_migration
branch
9 times, most recently
from
July 8, 2017 16:34
a9d4ece
to
04ac461
Compare
Codecov Report
@@ Coverage Diff @@
## master #40 +/- ##
==========================================
- Coverage 94.82% 94.69% -0.14%
==========================================
Files 4 4
Lines 174 132 -42
==========================================
- Hits 165 125 -40
+ Misses 5 4 -1
+ Partials 4 3 -1
Continue to review full report at Codecov.
|
Push --force 0d6d73f : Rebase master and port any new code merged in master to migrated files. |
* This command `octopus merge` will be used to replace the old `git-octopus` command, with a more human readable syntax (ala git).
* passing args to `run.Run()` doesnt seem to work * `octopus merge branch1 branch2` seems to work
* report old config flags to the merge command
* remove and migrate to `octopus version`
* Transpose everything in /run into octopus/merge * Remove dependencies to parent package run * Squash tests to follow go test convention 1test per file * migrate config to merge (only used by the merge command)
* Make flags behave like gitconfigs and git flags usually work together If not set has a default value, overrided by config file, and lastly overrided by the usage of the flag * The new config file is $HOME/.octopus.yaml If not found, checks ./.octopus.yaml * config file can be passed via the flag `--config myconfigfile`
* conf is only used by merge
* Pass a merge.Config to the tested Merge method
* Should fix old tests/compile
* Via `gvt fetch`
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.
The goal is to have a more extendable octopus toolbox, and a better CLI syntax (the one enforced by cobra).
It should migrate the syntax from
git-octopus -args param
tooctopus merge -args params
.This change is