* Add dolt merge status table
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
Co-authored-by: druvv <druvv@users.noreply.github.com>
doltremoteapi can return an opaque token which makes it cheaper to access the
repository than just using the RepoId. This updates protos and remotestorage
implementation to cache that token and use it for future accesses of the same
repository.
* persistable vars
* [no-release-notes] text and json types written as byte trees
* fmt
* more tests, fix other failing tests
* GMS bump
* fix remaining tests
* small fixes
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* bats failures
* revert
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* tidy
* update plans
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* more plan changes
* delete todo
* better docstring
* zach comments
Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>
* [no-release-notes] New format blob read/write
Use blob chunker to write blobs out of band. Tests for
round tripping and address walking at the tree level.
Run Blob enginetests and extra large file blob tests.
* NodeStore ref refactors
* fix index
* run verify
* fix more bats
* small PR cleanup
* more changes
* last bats errors
* Add Hash160Enc
* persist and read conflicts from merge artifacts table
* update some tests
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* comment / cleanup prolly/artifact_map.go
* ~copyright~
* reskip TestDoltMerge
* rename Hash160Enc to Address
* change ArtifactType from string to uint8
* fix zero value for ArtifactType
Co-authored-by: druvv <druvv@users.noreply.github.com>
Until this point, __DOLT_DEV__ has left MergeState in the working set
as an address pointing at a types.Struct with the root value ref and
the from commit inlined. This converts MergeState to store the commit
as an address and to store both addrs inline the MergeState table.
