e059edd1b2
Skip dolt_ignore tests on LD_1
2023-04-27 20:25:55 -07:00
862fdeef44
Merge branch 'main' of github.com:dolthub/dolt into nicktobey/doltignore
2023-04-27 16:38:26 -07:00
8031eaaf5b
Add additional bats tests to ignore.bats
2023-04-27 16:31:24 -07:00
9d4ba3906c
Merge pull request #5827 from dolthub/JCOR11599-42232b26
...
[auto-bump] [no-release-notes] dependency by JCOR11599
2023-04-27 16:22:45 -07:00
80364f012b
Update ignore.bats to be compatible with cli changes to show and commit.
2023-04-27 16:13:48 -07:00
836cca9c3c
Added todo about simplifying table creation logic in ignore_table.go
2023-04-27 16:03:38 -07:00
ed0c7c0024
Merge branch 'nicktobey/doltignore' of github.com:dolthub/dolt into nicktobey/doltignore
2023-04-27 16:00:36 -07:00
fab8b7565e
Change flag for showing ignored files in status to ignored from show-ignored, and removed the shorthand option.
2023-04-27 16:00:24 -07:00
18db051c7a
Rename ignore_patterns.go to ignore.go
2023-04-27 15:53:31 -07:00
db7600a822
Move IgnoredTables into ignore_patterns.go
2023-04-27 15:53:00 -07:00
211e3ce6a5
Update docstring in root_val.go
2023-04-27 15:50:37 -07:00
8cf65b1339
Remove dolt commit --addIgnored. Users who want to stage ignored files should use dolt add --force
2023-04-27 15:48:14 -07:00
83fab42d62
Update typo in integration-tests/bats/ignore.bats
...
Co-authored-by: Jason Fulghum <jason@dolthub.com >
2023-04-27 15:43:15 -07:00
1fa638651c
Remove obsolete todo in go/cmd/dolt/commands/status.go
...
Co-authored-by: Jason Fulghum <jason@dolthub.com >
2023-04-27 15:42:55 -07:00
226dc15649
Update command line description in go/cmd/dolt/commands/stashcmds/stash.go
...
Co-authored-by: Jason Fulghum <jason@dolthub.com >
2023-04-27 15:42:05 -07:00
65f6202a3a
Don't wrap error when commit error message fails to display diff.
2023-04-27 15:26:46 -07:00
f97c0251a2
Remove some debug logging from root_val.go
2023-04-27 14:16:57 -07:00
5fb6b1f2c5
Update ignore.bats based on changed behavior to dolt status
2023-04-27 14:14:48 -07:00
a79fda9880
Only print ignored files in dolt status when --show-ignored is passed.
2023-04-27 14:00:27 -07:00
8339b564c8
Separate ignored tables into their own section on dolt status
2023-04-27 12:50:15 -07:00
5431cb3b6e
Fix use of DoltIgnoreConflictError
2023-04-27 12:49:11 -07:00
52281a1c5a
Fix static-time type checking in ignore_table.go
2023-04-27 11:38:28 -07:00
bfc92342ca
Merge branch 'nicktobey/doltignore' of github.com:dolthub/dolt into nicktobey/doltignore
2023-04-27 11:32:50 -07:00
a3ace39172
Refactor DoltIgnoreConflictError
2023-04-27 11:32:39 -07:00
731844cdd7
Update docstring in go/libraries/doltcore/doltdb/root_val.go
...
Co-authored-by: Jason Fulghum <jason@dolthub.com >
2023-04-27 11:26:45 -07:00
e38e4eb6fc
Add additional bats tests for dolt_ignore.
2023-04-27 11:23:29 -07:00
41e0ca4407
Update documentation wording in go/cmd/dolt/commands/stashcmds/stash.go
...
Co-authored-by: Jason Fulghum <jason@dolthub.com >
2023-04-27 11:12:42 -07:00
0d9356a15b
Add additional bats tests for dolt_ignore.
2023-04-27 11:11:05 -07:00
c747de99fd
If any table deltas aren't adds, then workingSetContainsOnlyIgnoredTables is false.
2023-04-27 11:10:53 -07:00
12707c3280
[ga-bump-dep] Bump dependency in Dolt by JCOR11599
2023-04-27 18:08:39 +00:00
0b9bc8d077
--data-dir flag enabled before the sql subcommand
...
The complexity of creating global arguments is being broken into multiple pieces. This step includes the breaking up of the top level dolt command set to enable global argument parsing and initialization of the CliContext. At present, the sql subcommand is the only one getting this treatment, but it will be extended with additional commands in the future.
This change doesn't change much that is visible to the user, with the exception of the --data-dir flag being enabled before the sql subcommand.
https://github.com/dolthub/dolt/issues/3922
2023-04-26 22:01:18 -07:00
9403d234e7
Merge pull request #5814 from dolthub/aaron/multirepoenv-dial-provider-from-bootstrap
...
go/libraries/doltcore/env/multi_repo_env.go: Always use the GRPCDialProvider from the bootstrap env for the MultiRepoEnv RemoteDialProvider.
2023-04-26 16:45:06 -07:00
18cb3e7f9d
Allow dolt as a bare command
2023-04-26 16:19:59 -07:00
4f7d40b118
All users of actions.StageTables and actions.StageAllTables specify whether to filter ignored tables.
...
Also add `--force` to `dolt add` and `--add-ignored` to `dolt commit`.
Git uses `--force` for both, but we're already using `dolt commit --force` to mean something else.
2023-04-26 16:00:24 -07:00
3bee1f35cd
Merge pull request #5806 from dolthub/fulghum/schema-merge
...
Report schema conflicts for merges with column type changes
2023-04-26 15:36:56 -07:00
7a84b4a8cc
Refactor hasLocalChanges into a linear sequence of checks with comments.
...
Reasoning about this is really hard.
2023-04-26 15:30:10 -07:00
1b49438e4f
Enable verbose logging of dolt_ignore conflicts when running dolt stash
2023-04-26 15:29:02 -07:00
c4ad42753b
Add BATS tests for dolt stash
2023-04-26 15:21:19 -07:00
e2fce1bba7
go/libraries/doltcore/env/multi_repo_env.go: Always use the GRPCDialProvider from the bootstrap env for the MultiRepoEnv RemoteDialProvider.
...
Fixes #5811 .
2023-04-26 15:13:57 -07:00
cdd957858a
dolt stash should stash untracked files if --all is provided.
2023-04-26 14:30:36 -07:00
8da064594a
Update ci-check-repo.yaml
2023-04-26 13:58:37 -07:00
616f0851c5
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-04-26 20:51:40 +00:00
fac735b543
PR Feedback and removing a panic required to speed testing up
2023-04-26 13:39:04 -07:00
f3b98bc4fe
Support case insensitive subcommand names
2023-04-26 13:39:04 -07:00
0f8c162e2a
dolt rm and dolt mv want to join the party
2023-04-26 13:39:04 -07:00
213de8c5cb
More test fixes with CliContext
2023-04-26 13:39:04 -07:00
d81e1a2a77
Enable the blame command for global args, since it depends on sql command
2023-04-26 13:39:04 -07:00
471c163cdf
Fix tests by passing in an empty CliContext
2023-04-26 13:39:04 -07:00
e89e99b89c
Ensure CliContext is never null for sql subcommand
2023-04-26 13:39:04 -07:00
0e053d4fe7
Test for new --data-dir option as global arg to sql subcommand
2023-04-26 13:39:04 -07:00
Nick Tobey