Re-add the interactive merge

[stgit] / contrib / stgit-completion.bash

diff --git a/contrib/stgit-completion.bash b/contrib/stgit-completion.bash
index a843db4407140dd68179950e51b82ba08cefe34e..b02eb64d1ced5e70feae395b67e6714c7a00c5bb 100644 (file)
--- a/contrib/stgit-completion.bash
+++ b/contrib/stgit-completion.bash
@@ -13,14 +13,15 @@
 _stg_commands="
     add
     applied
 _stg_commands="
     add
     applied

-    assimilate

     branch
     delete
     diff
     clean
     clone
     branch
     delete
     diff
     clean
     clone

+    coalesce

     commit
     cp
     commit
     cp

+    edit

     export
     files
     float
     export
     files
     float


@@ -41,6 +42,7 @@ _stg_commands="
     rebase
     refresh
     rename
     rebase
     refresh
     rename

+    repair

     resolved
     rm
     series
     resolved
     rm
     series


@@ -108,7 +110,31 @@ _all_other_patches ()
 _all_branches ()
 {
     local g=$(_gitdir)
 _all_branches ()
 {
     local g=$(_gitdir)

-    [ "$g" ] && (cd .git/patches/ && echo *)
+    [ "$g" ] && (cd $g/patches/ && echo *)
+}
+
+_conflicting_files ()
+{
+    local g=$(_gitdir)
+    [ "$g" ] && stg status --conflict
+}
+
+_dirty_files ()
+{
+    local g=$(_gitdir)
+    [ "$g" ] && stg status --modified --new --deleted
+}
+
+_unknown_files ()
+{
+    local g=$(_gitdir)
+    [ "$g" ] && stg status --unknown
+}
+
+_known_files ()
+{
+    local g=$(_gitdir)
+    [ "$g" ] && git ls-files

 }
 
 # List the command options
 }
 
 # List the command options


@@ -162,6 +188,11 @@ _complete_options ()
     COMPREPLY=($(compgen -W "$options" -- "${COMP_WORDS[COMP_CWORD]}"))
 }
 
     COMPREPLY=($(compgen -W "$options" -- "${COMP_WORDS[COMP_CWORD]}"))
 }
 

+_complete_files ()
+{
+    COMPREPLY=($(compgen -W "$(_cmd_options $1) $2" -- "${COMP_WORDS[COMP_CWORD]}"))
+}
+

 _stg_common ()
 {
     _complete_options "$(_cmd_options $1)"
 _stg_common ()
 {
     _complete_options "$(_cmd_options $1)"


@@ -208,6 +239,7 @@ _stg ()
         # repository commands
         id)     _stg_patches $command _all_patches ;;
         # stack commands
         # repository commands
         id)     _stg_patches $command _all_patches ;;
         # stack commands

+        coalesce) _stg_patches $command _applied_patches ;;

         float)  _stg_patches $command _all_patches ;;
         goto)   _stg_patches $command _all_other_patches ;;
         hide)   _stg_patches $command _unapplied_patches ;;
         float)  _stg_patches $command _all_patches ;;
         goto)   _stg_patches $command _all_other_patches ;;
         hide)   _stg_patches $command _unapplied_patches ;;


@@ -218,17 +250,22 @@ _stg ()
         unhide) _stg_patches $command _hidden_patches ;;
         # patch commands
         delete) _stg_patches $command _all_patches ;;
         unhide) _stg_patches $command _hidden_patches ;;
         # patch commands
         delete) _stg_patches $command _all_patches ;;

+        edit)   _stg_patches $command _applied_patches ;;

         export) _stg_patches $command _applied_patches ;;
         files)  _stg_patches $command _all_patches ;;
         log)    _stg_patches $command _all_patches ;;
         mail)   _stg_patches $command _all_patches ;;
         pick)   _stg_patches $command _unapplied_patches ;;
         export) _stg_patches $command _applied_patches ;;
         files)  _stg_patches $command _all_patches ;;
         log)    _stg_patches $command _all_patches ;;
         mail)   _stg_patches $command _all_patches ;;
         pick)   _stg_patches $command _unapplied_patches ;;

-        refresh)_stg_patches_options $command _applied_patches "-p --patch" ;;
+#      refresh)_stg_patches_options $command _applied_patches "-p --patch" ;;
+        refresh) _complete_files $command "$(_dirty_files)" ;;

         rename) _stg_patches $command _all_patches ;;
         show)   _stg_patches $command _all_patches ;;
         sync)   _stg_patches $command _applied_patches ;;
         # working-copy commands
         diff)   _stg_patches_options $command _applied_patches "-r --range" ;;
         rename) _stg_patches $command _all_patches ;;
         show)   _stg_patches $command _all_patches ;;
         sync)   _stg_patches $command _applied_patches ;;
         # working-copy commands
         diff)   _stg_patches_options $command _applied_patches "-r --range" ;;

+       resolved) _complete_files $command "$(_conflicting_files)" ;;
+       add)    _complete_files $command "$(_unknown_files)" ;;
+#      rm)     _complete_files $command "$(_known_files)" ;;

        # commands that usually raher accept branches
        branch) _complete_branch $command _all_branches ;;
        rebase) _complete_branch $command _all_branches ;;
        # commands that usually raher accept branches
        branch) _complete_branch $command _all_branches ;;
        rebase) _complete_branch $command _all_branches ;;