Skip to content
This repository was archived by the owner on Oct 30, 2025. It is now read-only.

Conversation

@hvihvi
Copy link
Contributor

@hvihvi hvihvi commented Jul 7, 2017

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 to octopus merge -args params.


This change is Reviewable

@hvihvi hvihvi force-pushed the cobra_migration branch 9 times, most recently from a9d4ece to 04ac461 Compare July 8, 2017 16:34
@hvihvi hvihvi changed the title WIP : Cobra migration Cobra migration Jul 8, 2017
@codecov-io
Copy link

codecov-io commented Jul 8, 2017

Codecov Report

Merging #40 into master will decrease coverage by 0.13%.
The diff coverage is 100%.

Impacted file tree graph

@@            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
Impacted Files Coverage Δ
octopus/git/git.go 100% <ø> (ø)
octopus/merge/matcher.go 100% <ø> (ø)
octopus/merge/config.go 100% <100%> (ø)
octopus/merge/merge.go 90.41% <100%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 05ad486...8c149cb. Read the comment docs.

@hvihvi hvihvi requested a review from apflieger July 8, 2017 17:04
@hvihvi
Copy link
Contributor Author

hvihvi commented Jul 11, 2017

Push --force 0d6d73f : Rebase master and port any new code merged in master to migrated files.

hvi added 15 commits July 11, 2017 16:40
* 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
@hvihvi hvihvi force-pushed the cobra_migration branch from 67a93c7 to 0d6d73f Compare July 11, 2017 15:04
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants