Skip to content

Commit

Permalink
git: diff-files
Browse files Browse the repository at this point in the history
  • Loading branch information
rsteube committed Mar 1, 2024
1 parent 6c6f9b4 commit 1df1c5a
Show file tree
Hide file tree
Showing 9 changed files with 361 additions and 132 deletions.
7 changes: 5 additions & 2 deletions completers/git_completer/cmd/common/diff.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,16 @@ func AddDiffFlags(cmd *cobra.Command) {
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().String("relative,", "", "exclude changes outside the directory")
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("stat", "", "")
cmd.Flags().String("stat", "", "Generate a diffstat")
cmd.Flags().String("stat-count", "", "Generate diffstat with limited lines")
cmd.Flags().String("stat-graph-width", "", "Generate diffstat with a given graph width")
cmd.Flags().String("stat-name-width", "", "Generate diffstat with a given filename width")
cmd.Flags().String("stat-width", "", "Generate diffstat with a given width")
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")
Expand Down
36 changes: 36 additions & 0 deletions completers/git_completer/cmd/common/pretty.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package common

import (
"github.com/rsteube/carapace"
"github.com/rsteube/carapace-bin/pkg/actions/text"
"github.com/spf13/cobra"
)

func AddPrettyFlags(cmd *cobra.Command) {
// TODO move stuff to revlist options
// TODO check if pretty is stil relevant
// TODO add missing flags fix completions
cmd.Flags().Bool("no-notes", false, "do not show notes")
cmd.Flags().String("notes", "", "show the notes that annotate the commit")
cmd.Flags().Bool("show-notes-by-default", false, "show the default notes")

cmd.Flag("notes").NoOptDefVal = " "

carapace.Gen(cmd).FlagCompletion(carapace.ActionMap{
"encoding": text.ActionEncodings(),
"format": carapace.ActionValues(), // TODO formats
"notes": carapace.ActionValues(), // TODO complete refs
"pretty": carapace.ActionValues(
"email",
"format:",
"full",
"fuller",
"medium",
"oneline",
"raw",
"reference",
"short",
"tformat:",
), // TODO format: and tformat:
})
}
227 changes: 227 additions & 0 deletions completers/git_completer/cmd/common/revListOptions.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,227 @@
package common

import (
"github.com/rsteube/carapace"
"github.com/rsteube/carapace-bin/pkg/actions/time"
"github.com/rsteube/carapace-bin/pkg/actions/tools/git"
"github.com/spf13/cobra"
)

// AddCommitLimitingOptions adds commit limiting options.
//
// https://git-scm.com/docs/git-rev-list#_commit_limiting
func AddCommitLimitingOptions(cmd *cobra.Command) {
cmd.Flags().String("after", "", "Show commits more recent than a specific date")
cmd.Flags().Bool("all", false, "Pretend as if all the refs in refs/ are listed on the command line")
cmd.Flags().Bool("all-match", false, "Limit output to ones matching all given --grep")
cmd.Flags().Bool("alternate-refs", false, "Pretend as if all alternate ref tips are listed on the command line")
cmd.Flags().String("author", "", "Limit output to ones with matching author header")
cmd.Flags().Bool("basic-regexp", false, "Consider the limiting patterns to be basic regular expressions")
cmd.Flags().String("before", "", "Show commits older than a specific date.")
cmd.Flags().Bool("boundary", false, "Output excluded boundary commits")
cmd.Flags().String("branches", "", "Pretend as if all the refs in refs/heads are listed on the command line")
cmd.Flags().Bool("cherry", false, "A synonym for --right-only --cherry-mark --no-merges")
cmd.Flags().Bool("cherry-mark", false, "Like --cherry-pick but mark commits rather than omitting them")
cmd.Flags().Bool("cherry-pick", false, "Omit any commit that introduces the same change as another commit")
cmd.Flags().String("committer", "", "Limit output to ones with matching committer header")
cmd.Flags().String("disk-usage", "", "Suppress normal output and print disk usage")
cmd.Flags().String("exclude", "", "Do not include matching refs the next option would consider")
cmd.Flags().Bool("exclude-first-parent-only", false, "For excluded commits follow only the first parent commit upon merge")
cmd.Flags().String("exclude-hidden", "", "Do not include refs that would be hidden")
cmd.Flags().BoolP("extended-regexp", "E", false, "Consider the limiting patterns to be extended regular expressions")
cmd.Flags().Bool("first-parent", false, "For included commits follow only the first parent commit upon merge")
cmd.Flags().BoolP("fixed-strings", "F", false, "Consider the limiting patterns to be fixed strings")
cmd.Flags().String("glob", "", "Pretend as if all matching refs are listed on the command line")
cmd.Flags().String("grep", "", "Limit output to ones with matching log message")
cmd.Flags().String("grep-reflog", "", "Limit output to ones with matching reflog entries")
cmd.Flags().Bool("ignore-missing", false, "Pretend as if the bad input was not given")
cmd.Flags().Bool("invert-grep", false, "Limit output to ones with non-matching log message")
cmd.Flags().Bool("left-only", false, "List only commits on the left side of a symmetric difference")
cmd.Flags().String("max-age", "", "Limit the commits output to specified time range")
cmd.Flags().StringP("max-count", "n", "", "Limit the number of commits to output")
cmd.Flags().String("max-parents", "", "Show only commits which have at most that many parent commits")
cmd.Flags().Bool("merge", false, "Show refs that touch files having a conflict and don’t exist on all heads to merge")
cmd.Flags().Bool("merges", false, "Print only merge commits")
cmd.Flags().String("min-age", "", "Limit the commits output to specified time range")
cmd.Flags().String("min-parents", "", "Show only commits which have at least that many parent commits")
cmd.Flags().Bool("no-max-parents", false, "Reset max-partents limit")
cmd.Flags().Bool("no-merges", false, "Do not print commits with more than one parent")
cmd.Flags().Bool("no-min-parents", false, "Reset min-parents limit")
cmd.Flags().Bool("not", false, "Reverses the meaning of the ^ prefix")
cmd.Flags().BoolP("perl-regexp", "P", false, "Consider the limiting patterns to be Perl-compatible regular expressions")
cmd.Flags().String("progress", "", "Show progress reports on stderr as objects are considered")
cmd.Flags().Bool("quiet", false, "Don’t print anything to standard output")
cmd.Flags().Bool("reflog", false, "Pretend as if all reflog objects are listed on the command line")
cmd.Flags().BoolP("regexp-ignore-case", "i", false, "Match the regular expression case insensitive")
cmd.Flags().String("remotes", "", "Pretend as if all the refs in refs/remotes are listed on the command line")
cmd.Flags().Bool("remove-empty", false, "Stop when a given path disappears from the tree")
cmd.Flags().Bool("right-only", false, "List only commits on the right side of a symmetric difference")
cmd.Flags().String("since", "", "Show commits more recent than a specific date")
cmd.Flags().String("since-as-filter", "", "Show all commits more recent than a specific date")
cmd.Flags().Bool("single-worktree", false, "Examine the current working tree only")
cmd.Flags().String("skip", "", "Skip number commits before starting to show the commit output")
cmd.Flags().Bool("stdin", false, "Read arguments from standard input as well")
cmd.Flags().String("tags", "", "Pretend as if all the refs in refs/tags are listed on the command line")
cmd.Flags().String("until", "", "Show commits older than a specific date.")
cmd.Flags().Bool("use-bitmap-index", false, "Try to speed up the traversal using the pack bitmap index")
cmd.Flags().BoolP("walk-reflogs", "g", false, "Walk reflog entries from the most recent one to older ones")

cmd.Flag("branches").NoOptDefVal = " "
cmd.Flag("disk-usage").NoOptDefVal = " "
cmd.Flag("exclude-hidden").NoOptDefVal = " "
cmd.Flag("remotes").NoOptDefVal = " "
cmd.Flag("tags").NoOptDefVal = " "

carapace.Gen(cmd).FlagCompletion(carapace.ActionMap{
"after": time.ActionDate(),
"author": git.ActionAuthors(),
"before": time.ActionDate(),
"branches": git.ActionLocalBranches(),
"committer": git.ActionCommitters(),
"disk-usage": carapace.ActionValues("human"),
"exclude": carapace.Batch(
git.ActionLocalBranches(),
git.ActionTags(),
git.ActionRemotes(),
).ToA(),
"exclude-hidden": carapace.ActionValues("receive", "uploadpack"),
"glob": carapace.ActionValues(), // TODO
"grep": carapace.ActionValues(), // TODO
"grep-reflog": carapace.ActionValues(), // TODO
"max-age": carapace.ActionValues(), // TODO
"max-count": carapace.ActionValues(), // TODO
"max-parents": carapace.ActionValues(), // TODO
"min-age": carapace.ActionValues(), // TODO
"min-parents": carapace.ActionValues(), // TODO
"progress": carapace.ActionValues(), // TODO
"remotes": git.ActionRemotes(),
"since": time.ActionDate(),
"since-as-filter": time.ActionDate(),
"skip": carapace.ActionValues(), // TODO
"tags": git.ActionTags(),
"until": time.ActionDate(),
})
}

// AddHistorySimplificationOptions adds history simplification options.
//
// https://git-scm.com/docs/git-rev-list#_history_simplification
func AddHistorySimplificationOptions(cmd *cobra.Command) {
cmd.Flags().String("ancestry-path", "", "Only display commits in that range that are ancestors of <commit>, descendants of <commit>, or <commit> itself")
cmd.Flags().Bool("dense", false, "Only the selected commits are shown, plus some to have a meaningful history")
cmd.Flags().Bool("full-history", false, "Same as the default mode, but does not prune some history")
cmd.Flags().Bool("show-pulls", false, "Include also any merge commits that are not TREESAME to the first parent but are TREESAME to a later parent")
cmd.Flags().Bool("simplify-by-decoration", false, "Commits that are referred by some branch or tag are selected")
cmd.Flags().Bool("simplify-merges", false, "Additional option to --full-history to remove some needless merges from the resulting history")
cmd.Flags().Bool("sparse", false, "All commits in the simplified history are shown")

cmd.Flag("ancestry-path").NoOptDefVal = " "

carapace.Gen(cmd).FlagCompletion(carapace.ActionMap{
"ancestry-path": git.ActionRefs(git.RefOption{}.Default()),
})
}

// AddBisectionHelperOptions completes bisection helper options.
//
// https://git-scm.com/docs/git-rev-list#_bisection_helpers
func AddBisectionHelperOptions(cmd *cobra.Command) {
cmd.Flags().Bool("bisect", false, "Limit output to the one commit object which is roughly halfway between included and excluded commits")
cmd.Flags().Bool("bisect-all", false, "This outputs all the commit objects between the included and excluded commits")
cmd.Flags().Bool("bisect-vars", false, "This calculates the same as --bisect, except that refs in refs/bisect/ are not used")
}

// AddCommitOrderingOptions adds commit ordering options.
//
// https://git-scm.com/docs/git-rev-list#_commit_ordering
func AddCommitOrderingOptions(cmd *cobra.Command) {
cmd.Flags().Bool("author-date-order", false, "Show commits in the author timestamp order")
cmd.Flags().Bool("date-order", false, "Show commits in the commit timestamp order")
cmd.Flags().Bool("reverse", false, "Output the commits in reverse order")
cmd.Flags().Bool("topo-order", false, "Avoid showing commits on multiple lines of history intermixed")
}

// AddCommitFormattingOptions adds commit formatting options.
//
// https://git-scm.com/docs/git-rev-list#_commit_formatting
func AddCommitFormattingOptions(cmd *cobra.Command) {
cmd.Flags().Bool("abbrev-commit", false, "Show a prefix that names the object uniquely")
cmd.Flags().Bool("children", false, "Print also the children of the commit")
cmd.Flags().Bool("commit-header", false, "Overrides a previous --no-commit-header")
cmd.Flags().Bool("count", false, "Only print a number stating how many commits would have been listed")
cmd.Flags().String("date", "", "Date format")
cmd.Flags().String("encoding", "", "Re-code the commit log message in given encoding")
cmd.Flags().String("expand-tabs", "", "Perform a tab expansion")
cmd.Flags().String("format", "", "Pretty-print the contents of the commit logs in a given format")
cmd.Flags().Bool("graph", false, "Draw a text-based graphical representation of the commit history")
cmd.Flags().Bool("header", false, "Print the contents of the commit in raw-format")
cmd.Flags().Bool("left-right", false, "Mark which side of a symmetric difference a commit is reachable from")
cmd.Flags().Bool("no-abbrev-commit", false, "Show the full 40-byte hexadecimal commit object name")
cmd.Flags().Bool("no-commit-header", false, "Suppress the header line containing \"commit\"")
cmd.Flags().Bool("no-expand-tabs", false, "Do not perform a tab expansion")
cmd.Flags().Bool("oneline", false, "This is a shorthand for \"--pretty=oneline --abbrev-commit\" used together")
cmd.Flags().Bool("parents", false, "Print also the parents of the commit")
cmd.Flags().String("pretty", "", "Pretty-print the contents of the commit logs in a given format")
cmd.Flags().Bool("relative-date", false, "Synonym for --date=relative")
cmd.Flags().String("show-linear-break", "", "Put a barrier in between branches in graph output")
cmd.Flags().Bool("show-signature", false, "Check the validity of a signed commit object")
cmd.Flags().Bool("timestamp", false, "Print the raw commit timestamp")

carapace.Gen(cmd).FlagCompletion(carapace.ActionMap{
"date": carapace.ActionValuesDescribed(
"relative", "shows dates relative to the current time",
"local", "is an alias for --date=default-local",
"iso", "shows timestamps in a ISO 8601-like format",
"iso8601", "shows timestamps in a ISO 8601-like format",
"iso-strict", "shows timestamps in strict ISO 8601 format",
"iso8601-strict", "shows timestamps in strict ISO 8601 format",
"rfc", "shows timestamps in RFC 2822 format",
"rfc2822", "shows timestamps in RFC 2822 format",
"short", "shows only the date, but not the time, in YYYY-MM-DD format",
"raw", "shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC)",
"human", "shows the date in human readable format",
"unix", "shows the date as a Unix epoch timestamp (seconds since 1970)",
"format:", "feeds the given format to your system strftime",
"format:%c", "show the date in your system locale’s preferred format",
"default", "the default format",
),
"encoding": carapace.ActionValues(), // TODO
"expand-tabs": carapace.ActionValues(), // TODO
"format": carapace.ActionValues("oneline", "short", "medium", "full", "fuller", "reference", "email", "raw", "format:"),
"pretty": carapace.ActionValues("oneline", "short", "medium", "full", "fuller", "reference", "email", "raw", "format:"),
"show-linear-break": carapace.ActionValues(), // TODO
})
}

// AddObjectTraversalOptions adds object traversal options.
//
// https://git-scm.com/docs/git-rev-list#_object_traversal
func AddObjectTraversalOptions(cmd *cobra.Command) {
cmd.Flags().Bool("do-walk", false, "Overrides a previous --no-walk")
cmd.Flags().Bool("exclude-promisor-objects", false, "Prefilter object traversal at promisor boundary")
cmd.Flags().String("filter", "", "Omits objects from the list of printed objects")
cmd.Flags().Bool("filter-print-omitted", false, "Print a list of the objects omitted by the filter")
cmd.Flags().Bool("filter-provided-objects", false, "Filter the list of explicitly provided objects")
cmd.Flags().Bool("in-commit-order", false, "Print tree and blob ids in order of the commits")
cmd.Flags().Bool("indexed-objects", false, "Pretend as if all trees and blobs used by the index are listed on the command line")
cmd.Flags().String("missing", "", "Specify how missing objects are handled")
cmd.Flags().Bool("no-filter", false, "Turn off any previous --filter= argument")
cmd.Flags().Bool("no-object-names", false, "Do not print the names of the object IDs that are found")
cmd.Flags().String("no-walk", "", "Only show the given commits, but do not traverse their ancestors")
cmd.Flags().Bool("object-names", false, "Print the names of the object IDs that are found")
cmd.Flags().Bool("objects", false, "Print the object IDs of any object referenced by the listed commits")
cmd.Flags().Bool("objects-edge", false, "Similar to --objects, but also print the IDs of excluded commits")
cmd.Flags().Bool("objects-edge-aggressive", false, "Similar to --objects-edge, but it tries harder to find excluded commits")
cmd.Flags().Bool("unpacked", false, "Print the object IDs that are not in packs")

carapace.Gen(cmd).FlagCompletion(carapace.ActionMap{
"filter": carapace.ActionValues(), // TODO
"missing": carapace.ActionValues(
"error", "requests that rev-list stop with an error if a missing object is encountered",
"allow-any", "allow object traversal to continue if a missing object is encountered",
"allow-promisor", "is like allow-any, but will only allow object traversal to continue for EXPECTED promisor missing objects",
"print", "is like allow-any, but will also print a list of the missing objects",
),
"no-walk": carapace.ActionValues("sorted", "unsorted"),
})
}
Loading

0 comments on commit 1df1c5a

Please sign in to comment.