d2ec6cf54d
Deleted batched tests and ripped out batch writer logic
2023-06-12 16:20:54 -07:00
15a9110a1a
Adding additional info link to error message
2023-06-12 16:20:21 -07:00
b745a8e1f2
Removed batch mode internals
2023-06-12 16:17:45 -07:00
bc91c20f5e
First pass at dolt_cherry_pick stored procedure support for dealing with conflicts
2023-06-12 16:17:31 -07:00
af918aba11
Killed batch processing mode
2023-06-12 16:08:36 -07:00
ee8a7e69f4
Merge pull request #6142 from dolthub/zachmu/ld-fix
...
New interface method to return underlying dolt dbs from a SqlDatabase…
2023-06-12 15:47:33 -07:00
7db9bf2d42
[no-release-notes] Silent error during forkExec if empty trailing arg ( #6141 )
2023-06-12 15:29:17 -07:00
e85f8dbcf2
Create the batsee output directory if one doesn't exist yet.
...
Also adding the output directory to .gitignore.
2023-06-12 15:11:28 -07:00
5020fa20ee
New interface method to return underlying dolt dbs from a SqlDatabase implementation (rather than type switch)
2023-06-12 14:22:56 -07:00
4d29dce2a3
Helper methods for testing MergeStat conflict/violation status
2023-06-12 13:42:04 -07:00
81a5554601
Differentiating between schema and content conflicts in merge command line output
2023-06-12 13:41:26 -07:00
de01d65f78
cherry pick command line merge support
2023-06-12 13:40:06 -07:00
1c5abe3bd0
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-06-12 20:38:58 +00:00
83cb087964
Fixed tests
2023-06-12 13:27:44 -07:00
680fae917f
Merge branch 'main' into zachmu/docs
2023-06-12 12:54:48 -07:00
687ecd4536
cherry-pick --abort support
2023-06-12 12:53:08 -07:00
b88d75e7a1
[ga-bump-dep] Bump dependency in Dolt by max-hoffman
2023-06-12 18:56:11 +00:00
08370a172c
[ga-bump-release] Update Dolt version to 1.4.0 and release v1.4.0
2023-06-12 17:45:06 +00:00
490a6a5a2c
Merge pull request #6011 from dolthub/pavel/dolt-status
2023-06-11 12:28:22 -10:00
506cd2dfa8
Fix a test.
2023-06-10 15:56:10 -07:00
03f5065981
Fix issue where "nothing to commit" message wasn't popping up.
...
Change what remote information we return about a branch, use this in `dolt status`.
2023-06-10 15:41:39 -07:00
026a69677e
[ga-bump-dep] Bump dependency in Dolt by jennifersp ( #6135 )
2023-06-09 20:53:10 -07:00
66954c46f7
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-06-10 02:47:17 +00:00
cb7cea8b34
fixed setting head ref vars
2023-06-09 19:21:50 -07:00
18592a1556
Bug fix for showing all revision databaess
2023-06-09 18:01:22 -07:00
2525de307d
Tests for USE of non-dolt dbs
2023-06-09 17:58:32 -07:00
8dc1190f73
Bug fixes for temp tables
2023-06-09 17:34:57 -07:00
5b1e1fdce0
Bug fix for no working set
2023-06-09 17:17:30 -07:00
08a6aec5cf
Bug fix caching during replication pull
2023-06-09 16:00:39 -07:00
edfa82607f
Add comments and remove unnecessary fmt.Print statement.
2023-06-09 15:52:35 -07:00
ccf7abb657
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-06-09 15:52:35 -07:00
1dee97fdb5
Fix issue with dolt status not handling JSONDocument return values.
2023-06-09 15:52:35 -07:00
0714a2ad86
Fix ignore.bats tests by filtering out ignored untracked tables, and by not filtering ignored staged tables.
2023-06-09 15:52:35 -07:00
6baccc4bf7
Allow dolt stash to invoke dolt status, by configuring dolt stash to have a configured cliCtx.
2023-06-09 15:52:35 -07:00
396176e344
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-06-09 15:52:35 -07:00
a0d7a155f5
PR feedback:
...
- remove extraneous BATS checks
- add more tests
- add correct copyright notice to new procedure
2023-06-09 15:52:35 -07:00
cc9e4c4a25
PR feedback:
...
- use (slightly) more expressive identifiers
- check remote output vs local output
- split up the logic of createPrintData into smaller functions
2023-06-09 15:52:35 -07:00
34e661749a
Rewrite dolt status subcommand to use SQL queries to generate results.
...
This change adds `remote` column to the `dolt_branches` table. This column identifies the remote for the branch.
This change adds `dolt_count_commits` function, which returns the number of commits between two commits.
Added more BATS tests for `dolt status`.
2023-06-09 15:52:35 -07:00
d0e20d5613
Merge main
2023-06-09 14:41:55 -07:00
f5f68434f4
Bug fix for dolt_checkout() on remote branch
2023-06-09 14:41:09 -07:00
5892b3277f
[ga-bump-dep] Bump dependency in Dolt by reltuk
2023-06-09 10:15:39 -07:00
6df12085ce
Fixing a few spots from GMS changes to Database()
2023-06-08 17:13:26 -07:00
9befd3f0fb
[ga-bump-dep] Bump dependency in Dolt by fulghum
2023-06-08 23:58:16 +00:00
0b52f6c424
Revert "Revert "Merge pull request #5968 from dolthub/zachmu/tx-6""
...
This reverts commit bb03b8cb25
2023-06-08 11:09:54 -07:00
bb03b8cb25
Revert "Merge pull request #5968 from dolthub/zachmu/tx-6"
...
This reverts commit 51c2129e519692f6ef92
2023-06-07 17:27:06 -07:00
b4aea5e17d
Fixing test
2023-06-07 16:16:33 -07:00
05fb2b8d34
Docs for sql-server command
2023-06-07 16:04:10 -07:00
9b2ea3d297
Update sql-server docs. Removed databases field from config.yaml. Fixed default
...
yaml file display to actually show all fields
2023-06-07 15:03:06 -07:00
6688243ea5
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-06-07 16:14:47 +00:00
9235bade1a
gms@main
2023-06-07 09:04:45 -07:00
Zach Musgrave