* cleanup table package
* delete TextTableWriter
* dolt index [cat, rebuild] for new format
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* fix tests
* use reflect.DeepEqual when determining column diff results
* use sql type compare instead of reflect.DeepEqual
* update test to use sql column types
* fix semantic merge conflict
Co-authored-by: druvv <druvv@users.noreply.github.com>
* reimplement dolt_transaction_merge_stomp at merge layer
add idx
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* fix tests
* remove stomp conflicts
* conflict reader must be reset each time PartitionRows is called
* reimplement dolt conflict resolve --theirs|--ours through sql path
Also drops manual conflict resolving through cli
* add cardinality columns to dolt_conflicts_table_name for keyless tables
* Adds keyless conflict deleting for new format
* dolt conflicts resolve sql impl for keyless tables
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* delete cli.ParseKeyValues
* fix tests
* temporarily allow dolt_docs to be mutated from SQL path
Because conflicts resolve uses the SQL path, dolt_docs needs to be editable.
* fix untested code, comment out docs tests
* bats
* fix a couple found merge bugs
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* if statements...
* add comments
Co-authored-by: druvv <druvv@users.noreply.github.com>
* dolt_checkout and read replication working set fixes
Sql path 'dolt_checkout' used to create a new branch from HEAD
if the checkout name did not have a remote tracking ref. The CLI,
on the other hand, will initialize a local branch if a remote tracking
ref with the same name in the default remote exists. The SQl path
now mirrors the CLI checkout: if we checkout a new branch, like
'new_feature', and we have previously fetched that branch from our
default remote, `dolt_checkout('feature')` will initialize a branch
using the head commit from the remote `feature`.
Second, read replication was creating a local tracking branch for
remote branches (sourced from the master remote), but not creating
corresponding working sets. This let users attach to new branches with
`use db/feature` syntax, but prevented users from
`dolt_checkout('feature')` both for the bug in dolt checkout, but also
because we created an intermediary state with a local branch, but
without a corresponding working set. SQL replication will now fetch,
create the new branch, and create the appropriate working set.
* jennifer's feedback
* unskip
* query catalog for new format
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
Co-authored-by: druvv <druvv@users.noreply.github.com>
* add our_diff_type and their_diff_type to dolt_conflicts_table_name
* pr comments
* rewrite dolt conflicts cat to use sql path
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* cleanup
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* add smoke test for conflict cat
Co-authored-by: druvv <druvv@users.noreply.github.com>
Andy Arthur