From 15817a0b0774d72c4853b07d6f8557d5068e5c28 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Fri, 27 Mar 2020 22:20:12 +0100
Subject: [PATCH] Fix git ranges completion, add gitk and tig

[ci skip]
---
 CHANGELOG.md                |  2 ++
 share/completions/git.fish  |  2 +-
 share/completions/gitk.fish | 27 +++++++++++++++++++++++++++
 share/completions/tig.fish  | 28 ++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 share/completions/gitk.fish
 create mode 100644 share/completions/tig.fish

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfdde9172..ca800a6c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,10 +22,12 @@
 
 #### Completions
 - Added completions for
+  - `gitk`
   - `wireshark`, `tshark`, and `dumpcap`
   - `dropdb`, `createdb`, `pg_restore`, `pg_dump` and `pg_dumpall`
   - `dhclient`
   - `tcpdump`
+  - `tig`
 
 ### Deprecations and removed features
 
diff --git a/share/completions/git.fish b/share/completions/git.fish
index 768e6e7c9..b99e1948b 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -515,7 +515,7 @@ function __fish_git_ranges
 
     set -l to $both[2]
     # Remove description from the from-ref, not the to-ref.
-    for from_ref in (__fish_git_refs | string match "$from" | string replace -r \t'.*$' '')
+    for from_ref in (__fish_git_refs | string match -e "$from" | string replace -r \t'.*$' '')
         for to_ref in (__fish_git_refs | string match "*$to*") # if $to is empty, this correctly matches everything
             printf "%s..%s\n" $from_ref $to_ref
         end
diff --git a/share/completions/gitk.fish b/share/completions/gitk.fish
new file mode 100644
index 000000000..17e0d4b6c
--- /dev/null
+++ b/share/completions/gitk.fish
@@ -0,0 +1,27 @@
+# gitk - The Git repository browser
+
+source $__fish_data_dir/completions/git.fish
+
+complete -c gitk -f -n 'not contains -- -- (commandline -opc)' -a '(__fish_git_ranges)'
+complete -c gitk -n 'contains -- -- (commandline -opc)' -F
+
+complete -c gitk -l all -d 'Show all refs (branches, tags, etc.)'
+complete -c gitk -l since=YYYY-MM-DD -x -d 'Show commits more recent that a specific date'
+complete -c gitk -l until=YYYY-MM-DD -x -d 'Show commits older than a specific date'
+complete -c gitk -l date-order -d 'Sort commits by date when possible'
+complete -c gitk -l merge -d 'On a merge conflict, show commits that modify conflicting files'
+complete -c gitk -l left-right -d 'Mark which side of a symmetric difference a commit is reachable from'
+complete -c gitk -l full-history -d 'When filtering history with -- path..., do not prune some history'
+complete -c gitk -l simplify-merges -d 'Hide needless merges from history'
+complete -c gitk -l ancestry-path -d 'Only display commits that exist directly on the ancestry chain between the given range'
+complete -c gitk -l argscmd= -d 'Command to be run to determine th revision range to show'
+complete -c gitk -l select-commit= -d 'Select the specified commit after loading the graph, instead of HEAD'
+complete -c gitk -l select-commit=HEAD -d 'Select the specified commit after loading the graph, instead of HEAD'
+complete -c gitk -n 'string match -rq -- "^--select-commit=" (commandline -ct)' -xa '(printf -- "--select-commit=%s\n" (__fish_git_refs))'
+complete -c gitk -s n -l max-count -x -d 'Limit the number of commits to output'
+complete -c gitk -xa -L1 -d '-L<start>,<end>:<file> trace the evolution of a line range'
+complete -c gitk -xa -L. -d '-L<funcname>:<file> trace the evolution of a function name regex'
+complete -c gitk -n 'string match -rq -- "^-L[^:]*": (commandline -ct)' -xa '(
+    set -l tok (string split -m 1 -- : (commandline -ct))
+    printf -- "$tok[1]:%s\n" (complete -C": $tok[2]")
+)'
diff --git a/share/completions/tig.fish b/share/completions/tig.fish
new file mode 100644
index 000000000..196f98468
--- /dev/null
+++ b/share/completions/tig.fish
@@ -0,0 +1,28 @@
+# tig - text-mode interface for Git
+
+not functions -q __fish_git && source $__fish_data_dir/completions/git.fish
+
+set -l subcommands log show reflog blame grep refs statsh status
+complete -c tig -n "not __fish_seen_subcommand_from $subcommands" -xa 'show\t"Open diff view using the given git-show(1) options"
+blame\t"Annotate the given file, takes git-blame(1) options"
+status\t"Start up in status view"
+log\t"Start up in log view view, displaying git-log(1) output"
+reflog\t"Start up in reflog view"
+refs\t"Start up in refs view"
+stash\t"Start up in stash view"
+grep\t"Open the grep view. Supports the same options as git-grep(1)"
+'
+complete -c tig -l stdin -d 'Read git commit IDs from stdin'
+complete -c tig -l pretty=raw -d 'Read git log output from stdin'
+complete -c tig -o C. -d 'Run as if Tig was started in .'
+complete -c tig -s v -l version -d 'Show version and exit'
+complete -c tig -s h -l help -d 'Show help message and exit'
+
+complete -c tig -n '__fish_seen_subcommand_from show' -xa '(set -l t (commandline -ct); complete -C"git show $t")'
+complete -c tig -n '__fish_seen_subcommand_from blame' -xa '(set -l t (commandline -ct); complete -C"git blame $t")'
+complete -c tig -n '__fish_seen_subcommand_from log' -xa '(set -l t (commandline -ct); complete -C"git log $t")'
+complete -c tig -n '__fish_seen_subcommand_from grep' -xa '(set -l t (commandline -ct); complete -C"git grep $t")'
+
+complete -c tig -f -n 'not contains -- -- (commandline -opc)' -a '(__fish_git_ranges)'
+complete -c tig -n 'contains -- -- (commandline -opc)' -F
+