better git completion

Ignore-this: af7fede5c1ee1d92c89d2887cbe54c0b

darcs-hash:20090204185826-69c1e-f72e06ad575efee258b392afd17255166ac4a260.gz

1 files changed, 226 insertions, 27 deletions

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 9e4116e5..f4da6624 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1,27 +1,226 @@
-complete -c git -a add -d 'Add file contents to the index'
-complete -c git -a apply -d 'Apply a patch on a git index file and a working tree'
-complete -c git -a archive -d 'Create an archive of files from a named tree'
-complete -c git -a bisect -d 'Find the change that introduced a bug by binary search'
-complete -c git -a branch -d 'List, create, or delete branches'
-complete -c git -a checkout -d 'Checkout and switch to a branch'
-complete -c git -a cherry-pick -d 'Apply the change introduced by an existing commit' 
-complete -c git -a clone -d 'Clone a repository into a new directory'
-complete -c git -a commit -d 'Record changes to the repository'
-complete -c git -a diff -d 'Show changes between commits, commit and working tree, etc'
-complete -c git -a fetch -d 'Download objects and refs from another repository'
-complete -c git -a grep -d 'Print lines matching a pattern'
-complete -c git -a init -d 'Create an empty git repository or reinitialize an existing one'
-complete -c git -a log -d 'Show commit logs'
-complete -c git -a merge -d 'Join two or more development histories together'
-complete -c git -a mv -d 'Move or rename a file, a directory, or a symlink'
-complete -c git -a prune -d 'Prune all unreachable objects from the object database'
-complete -c git -a pull -d 'Fetch from and merge with another repository or a local branch'
-complete -c git -a push -d 'Update remote refs along with associated objects'
-complete -c git -a rebase -d 'Forward-port local commits to the updated upstream head'
-complete -c git -a reset -d 'Reset current HEAD to the specified state'
-complete -c git -a revert -d 'Revert an existing commit'
-complete -c git -a rm -d 'Remove files from the working tree and from the index'
-complete -c git -a show -d 'Show various types of objects'
-complete -c git -a show-branch -d 'Show branches and their commits'
-complete -c git -a status -d 'Show the working tree status'
-complete -c git -a tag -d 'Create, list, delete or verify a tag object signed with GPG'
+# fish completion for git
+
+function __fish_git_branches
+  git branch --no-color -a 2>/dev/null | sed 's/^..//'
+end
+
+function __fish_git_tags
+  git tag
+end
+
+function __fish_git_heads
+  __fish_git_branches
+  __fish_git_tags
+end
+
+function __fish_git_remotes
+  git remote
+end
+
+function __fish_git_ranges
+  set from (commandline -ot | perl -ne 'my @parts = split(/\.\./); print $parts[0]')
+  set to (commandline -ot | perl -ne 'my @parts = split(/\.\./); print $parts[1]')
+  if [ "$from" = "" ]
+    __fish_git_branches
+    return 0
+  end
+
+  for from_ref in (__fish_git_heads | grep -e "$from")
+    for to_ref in (__fish_git_heads | grep -e "$to")
+      printf "%s..%s\n" $from_ref $to_ref
+    end
+  end
+end
+
+function __fish_git_needs_command
+  set cmd (commandline -opc)
+  if [ (count $cmd) -eq 1 -a $cmd[1] = 'git' ]
+    return 0
+  end
+  return 1
+end
+
+function __fish_git_using_command
+  set cmd (commandline -opc)
+  if [ (count $cmd) -gt 1 ]
+    if [ $argv[1] = $cmd[2] ]
+      return 0
+    end
+  end
+  return 1
+end
+
+# general options
+complete -f -c git -n 'not __fish_git_needs_command' -l help -d 'Display the manual of a git command'
+
+#### fetch
+complete -f -c git -n '__fish_git_needs_command' -a fetch -d 'Download objects and refs from another repository'
+complete -f -c git -n '__fish_git_using_command fetch' -a '(__fish_git_remotes)' -d 'Remote'
+complete -f -c git -n '__fish_git_using_command fetch' -s q -l quiet -d 'Be quiet'
+complete -f -c git -n '__fish_git_using_command fetch' -s v -l verbose -d 'Be verbose'
+complete -f -c git -n '__fish_git_using_command fetch' -s a -l append -d 'Append ref names and object names'
+# TODO --upload-pack
+complete -f -c git -n '__fish_git_using_command fetch' -s f -l force -d 'Force update of local branches'
+# TODO other options
+
+### remote
+complete -f -c git -n '__fish_git_needs_command' -a remote -d 'Manage set of tracked repositories'
+complete -f -c git -n '__fish_git_using_command remote' -a '(__fish_git_remotes)'
+complete -f -c git -n '__fish_git_using_command remote' -s v -l verbose -d 'Be verbose'
+complete -f -c git -n '__fish_git_using_command remote' -a add -d 'Adds a new remote'
+complete -f -c git -n '__fish_git_using_command remote' -a rm -d 'Removes a remote'
+complete -f -c git -n '__fish_git_using_command remote' -a show -d 'Shows a remote'
+complete -f -c git -n '__fish_git_using_command remote' -a prune -d 'Deletes all stale tracking branches'
+complete -f -c git -n '__fish_git_using_command remote' -a update -d 'Fetches updates'
+# TODO options
+
+### show
+complete -f -c git -n '__fish_git_needs_command' -a show -d 'Shows the last commit of a branch'
+complete -f -c git -n '__fish_git_using_command show' -a '(__fish_git_branches)' -d 'Branch'
+# TODO options
+
+### show-branch
+complete -f -c git -n '__fish_git_needs_command' -a show-branch -d 'Shows the commits on branches'
+complete -f -c git -n '__fish_git_using_command show-branch' -a '(__fish_git_heads)' --description 'Branch'
+# TODO options
+
+### add
+complete -c git -n '__fish_git_needs_command'    -a add -d 'Add file contents to the index'
+# TODO options
+
+### checkout
+complete -f -c git -n '__fish_git_needs_command'    -a checkout -d 'Checkout and switch to a branch'
+complete -c git -n '__fish_git_using_command checkout'  -a '(__fish_git_branches)' --description 'Branch'
+complete -c git -n '__fish_git_using_command checkout'  -a '(__fish_git_tags)' --description 'Tag'
+complete -c git -n '__fish_git_using_command checkout' -s b -d 'Create a new branch'
+# TODO options
+
+### apply
+complete -f -c git -n '__fish_git_needs_command' -a apply -d 'Apply a patch on a git index file and a working tree'
+# TODO options
+
+### archive
+complete -f -c git -n '__fish_git_needs_command' -a archive -d 'Create an archive of files from a named tree'
+# TODO options
+
+### bisect
+complete -f -c git -n '__fish_git_needs_command' -a bisect -d 'Find the change that introduced a bug by binary search'
+# TODO options
+
+### branch
+complete -f -c git -n '__fish_git_needs_command' -a branch -d 'List, create, or delete branches'
+complete -f -c git -n '__fish_git_using_command branch' -a '(__fish_git_branches)' -d 'Branch'
+complete -f -c git -n '__fish_git_using_command branch' -s d -d 'Delete Branch'
+complete -f -c git -n '__fish_git_using_command branch' -s D -d 'Force deletion of branch'
+complete -f -c git -n '__fish_git_using_command branch' -s m -d 'Rename branch'
+complete -f -c git -n '__fish_git_using_command branch' -s M -d 'Force renaming branch'
+complete -f -c git -n '__fish_git_using_command branch' -s a -d 'Lists both local and remote branches'
+
+### cherry-pick
+complete -f -c git -n '__fish_git_needs_command' -a cherry-pick -d 'Apply the change introduced by an existing commit' 
+complete -f -c git -n '__fish_git_using_command cherry-pick' -a '(__fish_git_branches)' -d 'Branch'
+# TODO options
+
+### clone
+complete -f -c git -n '__fish_git_needs_command' -a clone -d 'Clone a repository into a new directory'
+# TODO options
+
+### commit
+complete -c git -n '__fish_git_needs_command'    -a commit -d 'Record changes to the repository'
+complete -c git -n '__fish_git_using_command commit' -l amend -d 'Amend the log message of the last commit'
+# TODO options
+
+### diff
+complete -c git -n '__fish_git_needs_command'    -a diff -d 'Show changes between commits, commit and working tree, etc'
+complete -c git -n '__fish_git_using_command diff' -a '(__fish_git_ranges)' -d 'Branch'
+complete -c git -n '__fish_git_using_command diff' -l cached -d 'Show diff of changes in the index'
+# TODO options
+
+### grep
+complete -c git -n '__fish_git_needs_command'    -a grep -d 'Print lines matching a pattern'
+# TODO options
+
+### init
+complete -f -c git -n '__fish_git_needs_command' -a init -d 'Create an empty git repository or reinitialize an existing one'
+# TODO options
+
+### log
+complete -c git -n '__fish_git_needs_command'    -a log -d 'Show commit logs'
+complete -c git -n '__fish_git_using_command log' -a '(__fish_git_heads) (__fish_git_ranges)' -d 'Branch'
+complete -f -c git -n '__fish_git_using_command log' -l pretty -a 'oneline short medium full fuller email raw format:'
+# TODO options
+
+### merge
+complete -f -c git -n '__fish_git_needs_command' -a merge -d 'Join two or more development histories together'
+complete -f -c git -n '__fish_git_using_command merge' -a '(__fish_git_branches)' -d 'Branch'
+complete -f -c git -n '__fish_git_using_command merge' -l commit -d "Autocommit the merge"
+complete -f -c git -n '__fish_git_using_command merge' -l no-commit -d "Don't autocommit the merge"
+complete -f -c git -n '__fish_git_using_command merge' -l stat -d "Show diffstat of the merge"
+complete -f -c git -n '__fish_git_using_command merge' -s n -l no-stat -d "Don't show diffstat of the merge"
+complete -f -c git -n '__fish_git_using_command merge' -l squash -d "Squash changes from other branch as a single commit"
+complete -f -c git -n '__fish_git_using_command merge' -l no-squash -d "Don't squash changes"
+complete -f -c git -n '__fish_git_using_command merge' -l ff -d "Don't generate a merge commit if merge is fast forward"
+complete -f -c git -n '__fish_git_using_command merge' -l no-ff -d "Generate a merge commit even if merge is fast forward"
+
+# TODO options
+
+### mv
+complete -c git -n '__fish_git_needs_command'    -a mv -d 'Move or rename a file, a directory, or a symlink'
+# TODO options
+
+### prune
+complete -f -c git -n '__fish_git_needs_command' -a prune -d 'Prune all unreachable objects from the object database'
+# TODO options
+
+### pull
+complete -f -c git -n '__fish_git_needs_command' -a pull -d 'Fetch from and merge with another repository or a local branch'
+# TODO options
+
+### push
+complete -f -c git -n '__fish_git_needs_command' -a push -d 'Update remote refs along with associated objects'
+# TODO options
+
+### rebase
+complete -f -c git -n '__fish_git_needs_command' -a rebase -d 'Forward-port local commits to the updated upstream head'
+complete -f -c git -n '__fish_git_using_command rebase' -a '(__fish_git_branches)' -d 'Branch'
+# TODO options
+
+### reset
+complete -c git -n '__fish_git_needs_command'    -a reset -d 'Reset current HEAD to the specified state'
+complete -f -c git -n '__fish_git_using_command reset' -l hard -d 'Reset files in working directory'
+complete -c git -n '__fish_git_using_command reset' -a '(__fish_git_branches)'
+# TODO options
+
+### revert
+complete -f -c git -n '__fish_git_needs_command' -a revert -d 'Revert an existing commit'
+# TODO options
+
+### rm
+complete -c git -n '__fish_git_needs_command'    -a rm -d 'Remove files from the working tree and from the index'
+# TODO options
+
+### status
+complete -f -c git -n '__fish_git_needs_command' -a status -d 'Show the working tree status'
+# TODO options
+
+### tag
+complete -f -c git -n '__fish_git_needs_command' -a tag -d 'Create, list, delete or verify a tag object signed with GPG'
+complete -f -c git -n '__fish_git_using_command tag; and __fish_not_contain_opt -s d; and __fish_not_contain_opt -s v; and test (count (commandline -opc | grep -v -e \'^-\')) -eq 3' -a '(__fish_git_branches)' -d 'Branch'
+complete -f -c git -n '__fish_git_using_command tag' -s d -d 'Remove a tag'
+complete -f -c git -n '__fish_git_using_command tag' -s v -d 'Verify signature of a tag'
+complete -f -c git -n '__fish_git_using_command tag' -s f -d 'Force overwriting exising tag'
+complete -f -c git -n '__fish_git_using_command tag' -s s -d 'Make a GPG-signed tag'
+complete -f -c git -n '__fish_contains_opt -s d' -a '(__fish_git_tags)' -d 'Tag'
+complete -f -c git -n '__fish_contains_opt -s v' -a '(__fish_git_tags)' -d 'Tag'
+# TODO options
+
+### config
+complete -f -c git -n '__fish_git_needs_command' -a config -d 'Set and read git configuration variables'
+# TODO options
+
+### format-patch
+complete -f -c git -n '__fish_git_needs_command' -a format-patch -d 'Generate patch series to send upstream'
+complete -f -c git -n '__fish_git_using_command format-patch' -a '(__fish_git_branches)' -d 'Branch'
+
+### aliases (custom user-definer commands)
+complete -c git -n '__fish_git_needs_command' -a '(git config --get-regexp alias | sed -e "s/^alias\.\(\S\+\).*/\1/")' -d 'Alias (user-defined command)'