From 48f8358a9b50f1ed0a2f13faebc35050eb44b207 Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan.semet@intel.com>
Date: Thu, 14 Feb 2013 16:38:47 +0100
Subject: [PATCH] better repo completion

---
 plugins/repo/_repo | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/plugins/repo/_repo b/plugins/repo/_repo
index 9cd293d38..7226aaceb 100644
--- a/plugins/repo/_repo
+++ b/plugins/repo/_repo
@@ -58,7 +58,24 @@ _repo()
         (branch | branches)
           # TODO : list available projects and add them in list to feed compadd with
           _arguments  : \
-                      '::__repo_projects'
+                     "(-h --help)"{-h,--help}"[Show help]" \
+                      ': :__repo_projects'
+          ret=0
+        ;;
+        (abandon)
+          # TODO : list available projects and add them in list to feed compadd with
+          _arguments  : \
+                     "(-h --help)"{-h,--help}"[Show help]" \
+                    ':branch name:__repo_branch' \
+                      ': :__repo_projects'
+          ret=0
+        ;;
+        (checkout)
+          # TODO : list available projects and add them in list to feed compadd with
+          _arguments  : \
+                     "(-h --help)"{-h,--help}"[Show help]" \
+                    ':branch name:__repo_branch' \
+                      ': :__repo_projects'
           ret=0
         ;;
         (init)
@@ -174,7 +191,9 @@ _group()
 
 __repo_branch()
 {
-  _message -e branch 'Repo branch'
+  #_message -e branch 'Repo branch'
+  branches=($(repo branches| cut -c4- | grep '|' | cut -d' ' -f1))
+  _describe -t branches 'Select repo branch' branches
 }
 
 __repo__repo_branch_or_rev()
@@ -189,19 +208,25 @@ __repo_depth_prompt()
 
 __repo_projects()
 {
-  #_message -e depth 'Optional option : <projects>...'
-  projects=($(repo list | cut -d' ' -f1))
+  _message -e depth 'Optional option : <projects>...'
+  projects=("" $(repo list | cut -d' ' -f1))
   _describe -t projects 'Select projects (keep empty for selecting all projects)' projects
 }
 
 __repo_new__repo_branch_name()
 {
-  _message -e depth '<new branch name>'
+  branches=($(repo branches| cut -c4- | grep '|' | cut -d' ' -f1))
+  _describe "" branches
+  _message -e "branch name" 'Enter new branch name or select an existing repo branch'
 }
 
 __repo_projects_or_all()
 {
-  _message -e depth '[--all | <project>...]'
+  #_message -e depth '[--all | <project>...]'
+  
+  projects=(--all $(repo list | cut -d' ' -f1))
+  _describe -t projects 'Select projects or --all' projects
+  _describe -t --all 'All projects'
 }
 
 _repo "$@"