Commit Graph

100 Commits

Author SHA1 Message Date
Stephanie You 279b40a96e migrate dolt gc to use sql queries 2023-12-04 11:59:56 -08:00
Stephanie You 5d24edd9ef address PR comments 2023-11-29 18:43:36 -08:00
Nick Tobey efff37bdf6 Update bats tests. These tests test handling data conflicts, but the behavior that was in the test (row deletion + column deletion) is no longer a conflict. This commit changes the behavior to something else that is a conflict. 2023-11-15 14:36:19 -08:00
stephanie 973e676a0e Merge branch 'main' into steph/ls 2023-10-18 15:52:26 -07:00
Stephanie You fe084708b5 add remote test for dolt merge-base 2023-10-18 13:41:45 -07:00
Stephanie You dbf8172b75 add remote test for dolt ls 2023-10-17 17:03:54 -07:00
Stephanie You 871fab1546 update bats tests 2023-10-13 01:12:59 -07:00
Stephanie You 8ce8a924e7 add remote test for dolt pull 2023-10-04 18:53:58 -07:00
Stephanie You 5514e2b395 add remote test for push 2023-09-29 15:10:38 -07:00
Zach Musgrave b435203659 Fixed bats tests 2023-09-26 12:00:00 -07:00
Stephanie You bea4f4514f add remote test for fetch 2023-09-12 12:44:04 -07:00
Stephanie You cdfabd2876 PR feedback 2023-08-29 14:35:24 -07:00
Stephanie You 84ce152367 PR feedback 2023-08-28 14:55:10 -07:00
Stephanie You f3f6558c8b fix tests using unmigrated cli commands 2023-08-23 15:37:01 -07:00
Stephanie You e2aec150a0 update tests using log as an unmigrated command 2023-08-23 11:01:09 -07:00
Jason Fulghum 4773192a50 Fixing missing "|| false" in BATS files 2023-08-09 12:10:14 -07:00
Stephanie You b08a4296d2 add warning for cli commands that don't support global args 2023-07-20 10:11:44 -07:00
Stephanie You 51075bbfed add test for unmigrated command error message 2023-07-19 12:29:57 -07:00
Neil Macneale IV c594538020 Merge pull request #6324 from dolthub/macneale4/sql-checkout-message
Disabling the ability to use the `dolt checkout` command when a local server is running.

While the implementation of checkout uses SQL calls, we need to be careful to not alter the default branch on the server. Currently that would result in no immediate changes, but restarting the server would result in being on a different branch which would be very confusing and possibly dangerous.
2023-07-13 11:10:35 -07:00
Neil Macneale IV 766916b1ae Merge pull request #6321 from dolthub/macneale4/cli-sql-clean
Migrate the clean command to sql
2023-07-12 17:23:41 -07:00
Neil Macneale IV a29429c28a Skip the existing checkout test until is supported in both modes 2023-07-12 16:32:08 -07:00
Neil Macneale IV b27ed02574 PR Feedback 2023-07-12 14:19:32 -07:00
Neil Macneale IV 2a64bcc05a PR Feedback addressed 2023-07-12 13:53:09 -07:00
Neil Macneale IV 64fee0adbb Verify that we get a helpful message when dolt checkout is executed with a running server. 2023-07-12 13:13:00 -07:00
Pavel Safronov 7bbc0a1f35 Fix intermittent BATS failure that happens when a tag like "v2" appears in the commit hash. (#6317) 2023-07-12 08:50:39 -07:00
Neil Macneale IV 7beb77798f Add a local-remote test for dolt clean 2023-07-11 18:01:00 -07:00
Nick Tobey 3eb8fc7a18 Merge pull request #6209 from dolthub/nicktobey/dolt-checkout
Migrate `dolt checkout` to new CLI framework.
2023-07-11 11:34:59 -07:00
Nick Tobey 06aa3208cd Added refernce to issue in comment. 2023-07-10 21:36:01 -07:00
Neil Macneale IV 6cb75de38e Merge remote-tracking branch 'origin/main' into sql-revert 2023-07-10 15:03:02 -07:00
Pavel Safronov 04351c1134 Merge branch 'main' into pavel/migrate-dolt-tag
# Conflicts:
#	integration-tests/bats/sql-local-remote.bats
2023-07-10 10:58:08 -07:00
Pavel Safronov f2dbaf12bb Add --verbose-engine-setup flag to the dolt tag invocations in sql-local-remote.bats, check output for expected state. 2023-07-10 10:52:43 -07:00
Nick Tobey 5de290ea44 Merge branch 'main' into nicktobey/dolt-checkout 2023-07-09 17:30:12 -07:00
Nick Tobey bbbc9e81d4 Add more tests for dolt checkout in remote mode. 2023-07-07 17:13:21 -07:00
Neil Macneale IV df19b14562 Merge remote-tracking branch 'origin/main' into sql-revert 2023-07-07 17:04:39 -07:00
Nick Tobey 32ce4d57f5 Add test for simple remote dolt-checkout functionality. 2023-07-07 12:04:07 -07:00
Pavel Safronov 6bdaaee1ca Add sql-local-remote.bats tests for dolt tag behavior. 2023-07-07 11:19:33 -07:00
Pavel Safronov 1d1722cbaf Merge branch 'main' into pavel/dolt-cherry-pick 2023-07-07 10:00:00 -07:00
Neil Macneale IV 6bc5a6c9c9 local-remote bats test for dolt revert 2023-07-07 09:09:45 -07:00
Stephanie You 762af8f9ea add test for dolt commit print 2023-06-29 17:31:03 -07:00
Stephanie You 6c82e55bde remove unneeded comments 2023-06-29 17:16:10 -07:00
Pavel Safronov 5b164e6ae8 Merge branch 'main' into pavel/dolt-cherry-pick
# Conflicts:
#	go/cmd/dolt/commands/status.go
#	integration-tests/bats/sql-local-remote.bats
2023-06-29 16:39:12 -07:00
stephanie c336e1063d Merge pull request #6214 from dolthub/steph/dolt-reset
updates dolt reset to use sql queries
2023-06-29 16:16:27 -07:00
Pavel Safronov 1932b62756 Merge branch 'main' into pavel/dolt-cherry-pick
# Conflicts:
#	integration-tests/bats/sql-local-remote.bats
2023-06-29 15:19:44 -07:00
Pavel Safronov 0ecad97682 Merge pull request #6223 from dolthub/pavel/dolt-conflicts-cat 2023-06-29 12:15:53 -10:00
stephanie e373a8fcb5 Merge branch 'main' into steph/dolt-reset 2023-06-29 13:14:17 -07:00
Stephanie You 56a223960c fix remote test for dolt reset 2023-06-29 11:59:43 -07:00
Pavel Safronov db9f9a8a30 PR feedback: remove DOLT_CLI_PASSWORD and --user dolt from sql-local-remote BATS test 2023-06-29 11:53:07 -07:00
Pavel Safronov 35573e85be Add cherry-pick tests under sql-local-remote.bats 2023-06-29 11:17:06 -07:00
Pavel Safronov a91012c558 PR feedback: got dolt conflicts resolve tests working in sql-local-remote.bats 2023-06-28 17:09:30 -07:00
Stephanie You afbf0a98ad fix missing brace 2023-06-28 17:05:40 -07:00