mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-17 23:56:33 -05:00
Code Issues Packages Projects Releases 147 Wiki Activity
9,282 Commits 167 Branches 618 Tags
21bc84fd893fc46690af7731388aaea487d24383
Commit Graph

9282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zach Musgrave
21bc84fd89 Finished putting merge state into working set 2021-06-22 19:43:40 -07:00
Zach Musgrave
e27f60d2c9 Merge state refactoring 2021-06-22 18:31:06 -07:00
Zach Musgrave
9de55db672 Fixed bug in initializing repo state 2021-06-22 14:36:13 -07:00
Zach Musgrave
0209ee4354 Got rid of StagedHash method 2021-06-22 14:11:03 -07:00
Zach Musgrave
12b3a95cd8 Starting to deprecate staged and working hashes in repo state 2021-06-22 13:47:22 -07:00
Zach Musgrave
851e21a279 Redirected CWB reads through env.RepoStateReader() 2021-06-22 12:56:38 -07:00
Zach Musgrave
5178312914 Removed a few places calling RepoState.Save directly 2021-06-22 12:44:40 -07:00
Zach Musgrave
71dd695655 Fixed bug in merge code, where we were updating the repo state file directly instead of using accessor methods 2021-06-21 18:23:40 -07:00
Zach Musgrave
bd6682a254 Fixed bug where we weren't updating the root values with feature version in all cases appropriately 2021-06-21 15:48:21 -07:00
Zach Musgrave
5c6853abde Fixed a zero-state bug 2021-06-21 14:55:27 -07:00
Zach Musgrave
53a0ec8fbc Added With* methods to workingset and made transaction code work with them 2021-06-21 10:00:59 -07:00
Zach Musgrave
5535387c94 Changed signature of env.UpdateWorkingRoot 2021-06-21 09:28:45 -07:00
Zach Musgrave
af8d109474 UpdateStagedRoot now uses working set 2021-06-21 09:03:54 -07:00
Zach Musgrave
0e4dde9ff6 Getting ready to hoist WorkingSet to a fundamental type in libraries 2021-06-19 15:15:44 -07:00
Zach Musgrave
cc82d9c1e0 Figured out how to store structs with partial fields 2021-06-19 14:31:01 -07:00
Zach Musgrave
5f2dcbea64 Biting the bullet and starting to add staged root and merge state to working set 2021-06-19 13:59:38 -07:00
Zach Musgrave
f7a26b999e Collapsed UpdateWorkingRoot into RepoStateWriter interface 2021-06-17 15:18:48 -07:00
Zach Musgrave
167c18f04d Finished passing working root around where needed 2021-06-17 12:54:09 -07:00
Zach Musgrave
c64d11ecc4 Merge branch 'master' into zachmu/tx-default 2021-06-16 17:31:35 -07:00
andrew-wm-arthur
75983973e2 [ga-bump-release] Update Dolt version to 0.26.9 and release v0.26.9 v0.26.9 2021-06-16 23:32:11 +00:00
Aaron Son
34e64f3a71 Merge pull request #1839 from dolthub/reltuk-a25dd40c 
[auto-bump] [no-release-notes] dependency by reltuk
 2021-06-16 16:29:31 -07:00
reltuk
7e2cc23f3a [ga-bump-dep] Bump dependency in Dolt by reltuk 2021-06-16 23:03:19 +00:00
Aaron Son
50d5f4fe46 Merge pull request #1837 from dolthub/reltuk-394c2ef3 
[auto-bump] [no-release-notes] dependency by reltuk
 2021-06-16 15:14:59 -07:00
reltuk
20df42d730 [ga-bump-dep] Bump dependency in Dolt by reltuk 2021-06-16 21:50:29 +00:00
Aaron Son
e8a291c42a go/libraries/doltcore/sqle/enginetest: Skip upcoming index-on-keyless-table enginetest. 2021-06-16 10:32:18 -07:00
Daylon Wilkins
a379f1322c Patched random ACCESS DENIED error on Windows 2021-06-15 16:44:45 -07:00
Brian Hendriks
5a04638656 --merges, --parents, --min-parents options for dolt log (#1831) 2021-06-15 16:15:28 -07:00
Brian Hendriks
029bb5d83b ctx to WithFilters (#1832) 2021-06-15 15:24:44 -07:00
Daylon Wilkins
151ca17cb2 Fixed #1824: Bug with adding index on merge 2021-06-15 10:41:40 -07:00
Vinai Rachakonda
bb3d6266ee Add test case for bytes parse bug (#1827) 
Fixes small bytes error
 2021-06-15 13:38:14 -04:00
Vinai Rachakonda
559de51aaa Add in for filtered table (#1826) 
Let's you do an IN clause with the dolt diff table
 2021-06-14 17:20:43 -04:00
reltuk
0967103579 [ga-bump-release] Update Dolt version to 0.26.8 and release v0.26.8 v0.26.8 2021-06-14 20:43:55 +00:00
Maximilian Hoffman
98b33c5f7a Merge pull request #1821 from dolthub/max-hoffman-58ad6465 
[auto-bump] [no-release-notes] dependency by max-hoffman
 2021-06-14 13:12:40 -07:00
Zach Musgrave
dbde7bcee6 Merge pull request #1825 from dolthub/zachmu/1824 
Skipped bats test for #1824
 2021-06-14 12:01:53 -07:00
Zach Musgrave
0f8237242f Skipped bats test for #1824 2021-06-14 11:30:41 -07:00
Vinai Rachakonda
f494c8f478 Vinai/elixir smoke test (#1815) 
Elixir integration
 2021-06-14 13:51:38 -04:00
Zach Musgrave
09b741dbeb Experimenting with a session based repo state reader, not sure I like it 2021-06-14 10:50:37 -07:00
AndyA
e96009d96d Merge pull request #1814 from dolthub/andy/broken-ntc-queries 
[no-release-notes] added broken queries
 2021-06-14 10:04:19 -07:00
max-hoffman
5f67039f3f [ga-bump-dep] Bump dependency in Dolt by max-hoffman 2021-06-14 16:58:30 +00:00
Andy Arthur
050ab60fa1 add copyright header 2021-06-14 09:31:14 -07:00
Zach Musgrave
db68c3a6c9 Refactoring, halfway through 2021-06-11 15:53:31 -07:00
Aaron Son
30b977942a Merge pull request #1813 from dolthub/aaron/install.sh-supports-darwin-arm64 
go/utils/publishrelease: install.sh: Install x86_64 binaries on MacOS M1.
 2021-06-11 15:36:16 -07:00
Dustin Brown
43ac9395a7 [auto-bump] [no-release-notes] dependency by VinaiRachakonda (#1810) 
Bump gms and add test case
 2021-06-11 18:03:20 -04:00
Andy Arthur
6f0a4ab4bd Merge branch 'andy/broken-ntc-queries' of github.com:dolthub/dolt into andy/broken-ntc-queries 2021-06-11 14:58:05 -07:00
Andy Arthur
70bb5b7d55 pr feedback 2021-06-11 14:57:47 -07:00
andrew-wm-arthur
1259173669 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2021-06-11 21:46:07 +00:00
Andy Arthur
7459dab905 added broken queries 2021-06-11 14:43:30 -07:00
Aaron Son
f59016db37 go/utils/publishrelease: install.sh: Install x86_64 binaries on MacOS M1. 2021-06-11 14:36:22 -07:00
Dustin Brown
7d50362f36 [auto-bump] [no-release-notes] dependency by VinaiRachakonda (#1808) 
Gms bump with locking test
 2021-06-11 17:19:19 -04:00
Aaron Son
79e7ba4a79 Merge pull request #1812 from dolthub/aaron/fkconstrain-check-support-types.Null-in-tuple 
go: fkconstrain: check: Correctly handle types.Null values in tuples being checked.
 2021-06-11 14:09:36 -07:00