Skip to content

Commit

Permalink
Merge pull request #2116 from rsteube/git-diff-changed
Browse files Browse the repository at this point in the history 
git: diff - only complete changed files
  • Loading branch information
@rsteube
rsteube authored Jan 5, 2024
2 parents a7c88f2 + 7cdd176 commit 074d27f
Show file tree
Hide file tree
Showing 3 changed files with 138 additions and 55 deletions.
173 changes: 120 additions & 53 deletions completers/git_completer/cmd/diff.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package cmd

import (
"strings"

"github.com/rsteube/carapace"
"github.com/rsteube/carapace-bin/pkg/actions/tools/git"
"github.com/rsteube/carapace/pkg/util"
"github.com/rsteube/carapace/pkg/style"
"github.com/spf13/cobra"
)

Expand All @@ -22,27 +24,95 @@ func init() {

carapace.Gen(diffCmd).PositionalAnyCompletion(
carapace.ActionCallback(func(c carapace.Context) carapace.Action {
if util.HasPathPrefix(c.Value) {
return carapace.ActionFiles()
if diffCmd.Flag("no-index").Changed {
switch len(c.Args) {
case 0, 1:
return carapace.ActionFiles()
default:
return carapace.ActionValues()
}
}

batch := carapace.Batch()

filtered := make([]string, 0)
for index, arg := range c.Args {
if index == 0 && strings.Contains(arg, "...") { // assume refrange - TODO what about '{ref}..{ref}'
filtered = append(filtered, arg)
break
}

if err := c.Command("git", "rev-parse", "--verify", arg).Run(); err != nil {
break
}
filtered = append(filtered, arg)
}

if len(filtered) == len(c.Args) && diffCmd.Flags().ArgsLenAtDash() < 0 {
switch len(filtered) {
case 0:
batch = append(batch, git.ActionRefRanges(git.RefOption{}.Default()))
default:
switch {
case strings.Contains(c.Args[0], "..."): // skip if we already have a refrange
case diffCmd.Flag("cached").Changed: // skip as '-cached' accepts only on ref
default:
batch = append(batch, git.ActionRefs(git.RefOption{}.Default()))
}
}
}

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

switch len(filtered) {
case 0:
if !diffCmd.Flag("cached").Changed {
// TODO `git diff` fails on deleted files (seems still worth seeing them in completion though)
batch = append(batch, git.ActionChanges(git.ChangeOpts{Unstaged: true}))
}
default:
// 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])
}
} else {
action = git.ActionRefDiffs(filtered...)
}

if len(filtered) > 0 { // multipart for potentially large diffs
action = action.MultiParts("/").StyleF(style.ForPathExt)
}
batch = append(batch, action)
}

return batch.ToA()
}),
)

carapace.Gen(diffCmd).DashAnyCompletion(
carapace.ActionPositional(diffCmd),
)
}

func addDiffFlags(cmd *cobra.Command) {
cmd.Flags().BoolS("0", "0", false, "Omit diff output for unmerged entries")
cmd.Flags().StringS("O", "O", "", "Control the order in which files appear in the output.")
cmd.Flags().StringS("O", "O", "", "Control the order in which files appear in the output")
cmd.Flags().BoolS("R", "R", false, "Swap two inputs")
cmd.Flags().StringS("S", "S", "", "Look for differences that change the number of occurrences of the specified string")
cmd.Flags().String("abbrev", "", "show only a partial prefix")
cmd.Flags().String("anchored", "", "Generate a diff using the \"anchored diff\" algorithm.")
cmd.Flags().String("anchored", "", "Generate a diff using the \"anchored diff\" algorithm")
cmd.Flags().BoolP("base", "1", false, "compare with base")
cmd.Flags().Bool("binary", false, "output a binary diff")
cmd.Flags().StringP("break-rewrites", "B", "", "Break complete rewrite changes into pairs of delete and create.")
cmd.Flags().StringP("break-rewrites", "B", "", "Break complete rewrite changes into pairs of delete and create")
cmd.Flags().Bool("cached", false, "View the changes you staged in the index/cache")
cmd.Flags().Bool("check", false, "Warn if changes introduce conflict markers or whitespace errors")
cmd.Flags().String("color", "", "Show colored diff.")
cmd.Flags().String("color-moved", "", "Moved lines of code are colored differently.")
cmd.Flags().String("color", "", "Show colored diff")
cmd.Flags().String("color-moved", "", "Moved lines of code are colored differently")
cmd.Flags().String("color-moved-ws", "", "This configures how whitespace is ignored when performing the move detection")
cmd.Flags().String("color-words", "", "Equivalent to --word-diff=color plus (if a regex was specified)")
cmd.Flags().Bool("compact-summary", false, "Output a condensed summary of extended header information")
Expand All @@ -51,67 +121,68 @@ func addDiffFlags(cmd *cobra.Command) {
cmd.Flags().String("diff-filter", "", "filter files")
cmd.Flags().StringP("dirstat", "X", "", "Output the distribution of relative amount of changes for each sub-directory")
cmd.Flags().String("dirstat-by-file", "", "Synonym for --dirstat=files,param1,param2...")
cmd.Flags().String("dst-prefix", "", "Show the given destination prefix instead of \"b/\".")
cmd.Flags().Bool("exit-code", false, "Make the program exit with codes similar to diff(1).")
cmd.Flags().Bool("ext-diff", false, "Allow an external diff helper to be executed.")
cmd.Flags().String("dst-prefix", "", "Show the given destination prefix instead of \"b/\"")
cmd.Flags().Bool("exit-code", false, "Make the program exit with codes similar to diff(1)")
cmd.Flags().Bool("ext-diff", false, "Allow an external diff helper to be executed")
cmd.Flags().StringP("find-copies", "C", "", "Detect copies as well as renames")
cmd.Flags().Bool("find-copies-harder", false, "inspect unmodified files as candidates for the source of copy")
cmd.Flags().String("find-object", "", "Look for differences that change the number of occurrences of the specified object.")
cmd.Flags().String("find-object", "", "Look for differences that change the number of occurrences of the specified object")
cmd.Flags().StringP("find-renames", "M", "", "Detect renames")
cmd.Flags().Bool("full-index", false, "show the full pre- and post-image blob object names")
cmd.Flags().BoolP("function-context", "W", false, "Show whole surrounding functions of changes.")
cmd.Flags().Bool("histogram", false, "Generate a diff using the \"histogram diff\" algorithm.")
cmd.Flags().BoolP("ignore-all-space", "w", false, "Ignore whitespace when comparing lines.")
cmd.Flags().Bool("ignore-blank-lines", false, "Ignore changes whose lines are all blank.")
cmd.Flags().Bool("ignore-cr-at-eol", false, "Ignore carriage-return at the end of line when doing a comparison.")
cmd.Flags().Bool("ignore-space-at-eol", false, "Ignore changes in whitespace at EOL.")
cmd.Flags().BoolP("ignore-space-change", "b", false, "Ignore changes in amount of whitespace.")
cmd.Flags().String("ignore-submodules", "", "Ignore changes to submodules in the diff generation.")
cmd.Flags().Bool("indent-heuristic", false, "Enable the heuristic that shifts diff hunk boundaries to make patches easier to read.")
cmd.Flags().BoolP("function-context", "W", false, "Show whole surrounding functions of changes")
cmd.Flags().Bool("histogram", false, "Generate a diff using the \"histogram diff\" algorithm")
cmd.Flags().BoolP("ignore-all-space", "w", false, "Ignore whitespace when comparing lines")
cmd.Flags().Bool("ignore-blank-lines", false, "Ignore changes whose lines are all blank")
cmd.Flags().Bool("ignore-cr-at-eol", false, "Ignore carriage-return at the end of line when doing a comparison")
cmd.Flags().Bool("ignore-space-at-eol", false, "Ignore changes in whitespace at EOL")
cmd.Flags().BoolP("ignore-space-change", "b", false, "Ignore changes in amount of whitespace")
cmd.Flags().String("ignore-submodules", "", "Ignore changes to submodules in the diff generation")
cmd.Flags().Bool("indent-heuristic", false, "Enable the heuristic that shifts diff hunk boundaries to make patches easier to read")
cmd.Flags().String("inter-hunk-context", "", "Show the context between diff hunks")
cmd.Flags().BoolP("irreversible-delete", "D", false, "Omit the preimage for deletes")
cmd.Flags().Bool("ita-invisible-in-index", false, "this option makes the entry appear as a new file")
cmd.Flags().StringS("l", "l", "", "prevent rename/copy detection from running if the number of rename/copy targets exceeds the specified number")
cmd.Flags().String("line-prefix", "", "Prepend an additional prefix to every line of output.")
cmd.Flags().Bool("minimal", false, "Spend extra time to make sure the smallest possible diff is produced.")
cmd.Flags().Bool("name-only", false, "Show only names of changed files.")
cmd.Flags().Bool("name-status", false, "Show only names and status of changed files.")
cmd.Flags().Bool("no-color", false, "Turn off colored diff.")
cmd.Flags().Bool("no-color-moved", false, "Turn off move detection.")
cmd.Flags().String("line-prefix", "", "Prepend an additional prefix to every line of output")
cmd.Flags().Bool("minimal", false, "Spend extra time to make sure the smallest possible diff is produced")
cmd.Flags().Bool("name-only", false, "Show only names of changed files")
cmd.Flags().Bool("name-status", false, "Show only names and status of changed files")
cmd.Flags().Bool("no-color", false, "Turn off colored diff")
cmd.Flags().Bool("no-color-moved", false, "Turn off move detection")
cmd.Flags().Bool("no-color-moved-ws", false, "Do not ignore whitespace when performing move detection")
cmd.Flags().Bool("no-ext-diff", false, "Disallow external diff drivers.")
cmd.Flags().Bool("no-indent-heuristic", false, "Disable the indent heuristic.")
cmd.Flags().BoolP("no-patch", "s", false, "Suppress diff output.")
cmd.Flags().Bool("no-prefix", false, "Do not show any source or destination prefix.")
cmd.Flags().Bool("no-rename-empty", false, "Whether to use empty blobs as rename source.")
cmd.Flags().Bool("no-ext-diff", false, "Disallow external diff drivers")
cmd.Flags().Bool("no-indent-heuristic", false, "Disable the indent heuristic")
cmd.Flags().Bool("no-index", false, "Compare paths on the file system")
cmd.Flags().BoolP("no-patch", "s", false, "Suppress diff output")
cmd.Flags().Bool("no-prefix", false, "Do not show any source or destination prefix")
cmd.Flags().Bool("no-rename-empty", false, "Whether to use empty blobs as rename source")
cmd.Flags().Bool("no-renames", false, "Turn off rename detection")
cmd.Flags().Bool("numstat", false, "Similar to --stat, but shows number of added and deleted lines in decimal notation")
cmd.Flags().BoolP("ours", "2", false, "compare with our branch")
cmd.Flags().String("output", "", "Output to a specific file instead of stdout.")
cmd.Flags().String("output-indicator-context", "", "Specify the character used to indicate context lines in the generated patch.")
cmd.Flags().String("output-indicator-new", "", "Specify the character used to indicate new lines in the generated patch.")
cmd.Flags().String("output-indicator-old", "", "Specify the character used to indicate old lines in the generated patch.")
cmd.Flags().String("output", "", "Output to a specific file instead of stdout")
cmd.Flags().String("output-indicator-context", "", "Specify the character used to indicate context lines in the generated patch")
cmd.Flags().String("output-indicator-new", "", "Specify the character used to indicate new lines in the generated patch")
cmd.Flags().String("output-indicator-old", "", "Specify the character used to indicate old lines in the generated patch")
cmd.Flags().BoolP("patch", "p", false, "Generate patch")
cmd.Flags().Bool("patch-with-raw", false, "Synonym for -p --raw.")
cmd.Flags().Bool("patch-with-stat", false, "Synonym for -p --stat.")
cmd.Flags().Bool("patience", false, "Generate a diff using the \"patience diff\" algorithm.")
cmd.Flags().Bool("patch-with-raw", false, "Synonym for -p --raw")
cmd.Flags().Bool("patch-with-stat", false, "Synonym for -p --stat")
cmd.Flags().Bool("patience", false, "Generate a diff using the \"patience diff\" algorithm")
cmd.Flags().Bool("pickaxe-all", false, "When -S or -G finds a change, show all the changes in that changeset")
cmd.Flags().Bool("pickaxe-regex", false, "Treat the <string> given to -S as an extended POSIX regular expression to match.")
cmd.Flags().Bool("quiet", false, "Disable all output of the program.")
cmd.Flags().Bool("raw", false, "Generate the diff in raw format.")
cmd.Flags().Bool("pickaxe-regex", false, "Treat the <string> given to -S as an extended POSIX regular expression to match")
cmd.Flags().Bool("quiet", false, "Disable all output of the program")
cmd.Flags().Bool("raw", false, "Generate the diff in raw format")
cmd.Flags().String("relative,", "", "exclude changes outside the directory")
cmd.Flags().Bool("rename-empty", false, "Whether to use empty blobs as rename source.")
cmd.Flags().Bool("rename-empty", false, "Whether to use empty blobs as rename source")
cmd.Flags().Bool("shortstat", false, "Output only the last line of the --stat format")
cmd.Flags().String("src-prefix", "", "Show the given source prefix instead of \"a/\".")
cmd.Flags().String("src-prefix", "", "Show the given source prefix instead of \"a/\"")
cmd.Flags().String("stat", "", "")
cmd.Flags().String("submodule", "", "Specify how differences in submodules are shown.")
cmd.Flags().String("submodule", "", "Specify how differences in submodules are shown")
cmd.Flags().Bool("summary", false, "Output a condensed summary of extended header information")
cmd.Flags().BoolP("text", "a", false, "Treat all files as text.")
cmd.Flags().BoolP("text", "a", false, "Treat all files as text")
cmd.Flags().String("textconv,", "", "Allow (or disallow) external text conversion filters to be run when comparing binary files")
cmd.Flags().BoolP("theirs", "3", false, "compare with their branch")
cmd.Flags().BoolS("u", "u", false, "Generate patch")
cmd.Flags().StringP("unified", "U", "", "Generate diffs with <n> lines of context instead of the usual three.")
cmd.Flags().String("word-diff", "", "Show a word diff, using the <mode> to delimit changed words.")
cmd.Flags().StringP("unified", "U", "", "Generate diffs with <n> lines of context instead of the usual three")
cmd.Flags().String("word-diff", "", "Show a word diff, using the <mode> to delimit changed words")
cmd.Flags().String("word-diff-regex", "", "Use <regex> to decide what a word is")
cmd.Flags().String("ws-error-highlight", "", "Highlight whitespace errors in the context, old or new lines of the diff")
cmd.Flags().BoolS("z", "z", false, "do not munge pathnames and use NULs as output field terminators")
Expand All @@ -131,8 +202,4 @@ func addDiffFlags(cmd *cobra.Command) {
"word-diff": git.ActionWordDiffModes(),
"ws-error-highlight": git.ActionWsErrorHighlightModes().UniqueList(","),
})

carapace.Gen(cmd).DashAnyCompletion(
carapace.ActionFiles(),
)
}
4 changes: 2 additions & 2 deletions pkg/actions/tools/git/change.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func ActionChanges(opts ChangeOpts) carapace.Action {
return carapace.ActionStyledValuesDescribed(untracked...)
}
})
})
}).Tag("changed files")
}

// ActionRefChanges completes changes made in given ref
Expand Down Expand Up @@ -94,5 +94,5 @@ func ActionRefChanges(ref string) carapace.Action {

return carapace.ActionValues(vals...).StyleF(style.ForPathExt)
})
})
}).Tag("changed files")
}
16 changes: 16 additions & 0 deletions pkg/actions/tools/git/diff.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,24 @@ func ActionDiffTools() carapace.Action {
// 1: compare current workspace to given ref
// 2: compare first ref to second ref
func ActionRefDiffs(refs ...string) carapace.Action {
return actionRefDiffs(false, refs...)
}

// ActionCachedDiffs completes changes between stage and given ref
func ActionCachedDiffs(ref string) carapace.Action {
return actionRefDiffs(true, ref)
}

func actionRefDiffs(cached bool, refs ...string) carapace.Action {
return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
args := []string{"diff", "--name-status"}
if cached {
args = append(args, "--cached")
if len(refs) != 1 {
return carapace.ActionMessage("only up to two refs allowed [ActionCachedDiffs]")
}
}

switch len(refs) {
case 0:
args = append(args, "HEAD")
Expand Down

0 comments on commit 074d27f

Please sign in to comment.