Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

git: diff - basic filtering #2119

Merged
merged 1 commit into from
Jan 5, 2024
Merged

git: diff - basic filtering #2119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions completers/git_completer/cmd/diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,13 @@ func init() {
}
}

expanded := filtered
if len(filtered) > 0 {
// TODO support/suppress '{ref}...{ref}'??
filtered = append(strings.SplitN(filtered[0], "..", 2), filtered[1:]...) // split refrange if any
expanded = append(strings.SplitN(filtered[0], "..", 2), filtered[1:]...) // split refrange if any
}

switch len(filtered) {
switch len(expanded) {
case 0:
if !diffCmd.Flag("cached").Changed {
// TODO `git diff` fails on deleted files (seems still worth seeing them in completion though)
Expand All @@ -77,17 +78,17 @@ func init() {
// TODO handle --merge-base with more than 2 refs
var action carapace.Action
if diffCmd.Flag("cached").Changed {
if len(filtered) > 0 {
action = git.ActionCachedDiffs(filtered[0])
if len(expanded) > 0 {
action = git.ActionCachedDiffs(expanded[0])
}
} else {
action = git.ActionRefDiffs(filtered...)
action = git.ActionRefDiffs(expanded...)
}

if len(filtered) > 0 { // multipart for potentially large diffs
if len(expanded) > 0 { // multipart for potentially large diffs
action = action.MultiParts("/").StyleF(style.ForPathExt).Tag("changed files")
}
batch = append(batch, action)
batch = append(batch, action.Filter(c.Args[len(filtered):]...))
}

return batch.ToA()
Expand Down