8031eaaf5b
Add additional bats tests to ignore.bats
2023-04-27 16:31:24 -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
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
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
cdd957858a
dolt stash should stash untracked files if --all is provided.
2023-04-26 14:30:36 -07:00
a616efd26a
Update ignore.bats
2023-04-26 12:11:44 -07:00
17538646f6
Merge branch 'nicktobey/doltignore' of github.com:dolthub/dolt into nicktobey/doltignore
2023-04-26 12:02:40 -07:00
fe78a96203
Add detailed error messaging when dolt_ignore rules conflict.
2023-04-26 12:02:00 -07:00
f0245299bf
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-04-26 18:40:22 +00:00
2871165311
Fix bug in IsTableNameIgnored
...
`trueMatches` and `falseMatches` should be lists of patterns, not table names.
2023-04-26 11:31:59 -07:00
23ae73c3e3
Clean up bats tests.
2023-04-26 11:23:37 -07:00
67f2461be6
Merge branch 'main' of github.com:dolthub/dolt into nicktobey/doltignore
2023-04-26 11:08:57 -07:00
6b9ce1f270
Add tags for dolt_ignore in reserved_tags.go
2023-04-26 10:59:49 -07:00
cdde95b432
Check that ignore_table schema is as expected.
2023-04-26 10:29:51 -07:00
fb80dc01de
Add check for storage format.
2023-04-26 10:10:35 -07:00
a1b43b9ceb
Reorder writeableSystemTables so it has the same order as persistedSystemTables.
2023-04-26 09:57:13 -07:00
f25deecfca
Merge pull request #5805 from dolthub/andy/schema-conflict-context
...
[no-release-notes] go/{commands, doltcore/merge}: improve schema conflicts UX
2023-04-26 09:29:09 -07:00
3b31b19deb
Add dolt_ignore to the list of writable and persisted system tables.
2023-04-26 00:00:03 -07:00
420ef13df0
Handle ignored tables in dolt stash.
2023-04-25 22:55:26 -07:00
5ccedbaecd
Outline GetIgnoredTablePatterns into its own function, and make IgnorePatterns a type with members so that we don't have to export the ignorePattern struct.
2023-04-25 22:53:09 -07:00
1d51563220
Merge pull request #5783 from dolthub/nicktobey/dolt-show
...
`dolt show` supports displaying non-commit objects.
2023-04-25 16:58:27 -07:00
445d98ade5
go/commands: add schema conflicts to dolt conflicts cat output
2023-04-25 16:43:04 -07:00
cdf1f1a714
Use IgnoreTableName constant in FilterIgnoredTables.
2023-04-25 15:44:23 -07:00
1bfe045d2f
go/doltcore/{merge,sqle}: populate description column for dolt_schema_conflicts table
2023-04-25 15:29:59 -07:00
Nick Tobey