refactor: Wire meta.DB through codebase #94
Conversation
Current Aviator status
This PR was merged using Aviator. Stack
|
twavv
changed the title
internal/meta/branchstate.go
Outdated
| } | ||
| return base, nil | ||
| } | ||
| //// BaseCommit determines the base commit for the given branch. |
There was a problem hiding this comment.
What's the intention for this comment out?
internal/meta/branch.go
Outdated
| func branchMetaRefName(branchName string) string { | ||
| return branchMetaRefPrefix + branchName | ||
| } | ||
| //func FindStackRoot(branches map[string]Branch, name string) (Branch, bool) { |
There was a problem hiding this comment.
What's the intention for the comment out?
There was a problem hiding this comment.
Just forgot to delete the function after deleting its usages. My bad!
cmd/av/stack_tree.go
Outdated
| if err != nil { | ||
| return err | ||
| } | ||
| tx := db.WriteTx() |
| if err != nil { | ||
| return err | ||
| } | ||
| tx := db.WriteTx() |
| if err := meta.WriteBranch(repo, *br); err != nil { | ||
| return err | ||
| } | ||
| tx.SetBranch(*br) | ||
| } | ||
| return nil |
There was a problem hiding this comment.
Technically, you want to cancel cu here. But if we change the Abort to be called even after Commit (like I commented in the other PR), we can omit the cancel.
| @@ -316,6 +323,9 @@ base branch. | |||
| if err := writeStackSyncState(repo, nil); err != nil { | |||
| return errors.Wrap(err, "failed to write stack sync state") | |||
| } | |||
| if err := tx.Commit(); err != nil { | |||
There was a problem hiding this comment.
Technically, we need to cancel cu every time we call Commit.
There was a problem hiding this comment.
Yeah just cancelled this to always defer tx.Abort().
| Parent: meta.BranchState{ | ||
| Name: parentBranchName, | ||
| Trunk: isBranchFromTrunk, | ||
| Head: parentHead, |
cmd/av/pr.go
Outdated
| tx := db.WriteTx() | ||
| var cu cleanup.Cleanup | ||
| defer cu.Cleanup() |
|
This pull request failed to merge: top queued PR in the stack failed to merge. Remove the |
twavv
force-pushed
the
travis/mer-2205-create-av-cli-db-interface
branch
from
5718042
to
68f461b
Compare
twavv
force-pushed
the
travis/mer-2210-wire-db-store
branch
from
25938f5
to
253fb67
Compare
This is obviously a pretty big change. Want to test it decently thoroughly and possibly add some more e2e type tests.
Next PR in stack will implement the import existing metadata from refs functionality.