git-add -i: add help text for list-and-choose UI

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 32fb9ea2bbfab424a1b189753fc818a9c405992a..335c2c6b56875b97ad6cf8f4406218833afc53ef 100755 (executable)
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -237,7 +237,8 @@ sub is_valid_prefix {
            !($prefix =~ /[\s,]/) && # separators
            !($prefix =~ /^-/) &&    # deselection
            !($prefix =~ /^\d+/) &&  # selection
            !($prefix =~ /[\s,]/) && # separators
            !($prefix =~ /^-/) &&    # deselection
            !($prefix =~ /^\d+/) &&  # selection

-           ($prefix ne '*');        # "all" wildcard
+           ($prefix ne '*') &&      # "all" wildcard
+           ($prefix ne '?');        # prompt help

 }
 
 # given a prefix/remainder tuple return a string with the prefix highlighted
 }
 
 # given a prefix/remainder tuple return a string with the prefix highlighted


@@ -318,6 +319,12 @@ sub list_and_choose {
                }
                chomp $line;
                last if $line eq '';
                }
                chomp $line;
                last if $line eq '';

+               if ($line eq '?') {
+                       $opts->{SINGLETON} ?
+                           singleton_prompt_help_cmd() :
+                           prompt_help_cmd();
+                       next TOPLOOP;
+               }

                for my $choice (split(/[\s,]+/, $line)) {
                        my $choose = 1;
                        my ($bottom, $top);
                for my $choice (split(/[\s,]+/, $line)) {
                        my $choose = 1;
                        my ($bottom, $top);


@@ -363,6 +370,28 @@ sub list_and_choose {
        return @return;
 }
 
        return @return;
 }
 

+sub singleton_prompt_help_cmd {
+       print <<\EOF ;
+Prompt help:
+1          - select a numbered item
+foo        - select item based on unique prefix
+           - (empty) select nothing
+EOF
+}
+
+sub prompt_help_cmd {
+       print <<\EOF ;
+Prompt help:
+1          - select a single item
+3-5        - select a range of items
+2-3,6-9    - select multiple ranges
+foo        - select item based on unique prefix
+-...       - unselect specified items
+*          - choose all items
+           - (empty) finish selecting
+EOF
+}
+

 sub status_cmd {
        list_and_choose({ LIST_ONLY => 1, HEADER => $status_head },
                        list_modified());
 sub status_cmd {
        list_and_choose({ LIST_ONLY => 1, HEADER => $status_head },
                        list_modified());