git-add -i: add help text for list-and-choose UI
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
633209898b
commit
7e018be2ad
@ -237,7 +237,8 @@ sub is_valid_prefix {
|
|||||||
!($prefix =~ /[\s,]/) && # separators
|
!($prefix =~ /[\s,]/) && # separators
|
||||||
!($prefix =~ /^-/) && # deselection
|
!($prefix =~ /^-/) && # deselection
|
||||||
!($prefix =~ /^\d+/) && # selection
|
!($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;
|
chomp $line;
|
||||||
last if $line eq '';
|
last if $line eq '';
|
||||||
|
if ($line eq '?') {
|
||||||
|
$opts->{SINGLETON} ?
|
||||||
|
singleton_prompt_help_cmd() :
|
||||||
|
prompt_help_cmd();
|
||||||
|
next TOPLOOP;
|
||||||
|
}
|
||||||
for my $choice (split(/[\s,]+/, $line)) {
|
for my $choice (split(/[\s,]+/, $line)) {
|
||||||
my $choose = 1;
|
my $choose = 1;
|
||||||
my ($bottom, $top);
|
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 {
|
sub status_cmd {
|
||||||
list_and_choose({ LIST_ONLY => 1, HEADER => $status_head },
|
list_and_choose({ LIST_ONLY => 1, HEADER => $status_head },
|
||||||
list_modified());
|
list_modified());
|
||||||
|
Loading…
Reference in New Issue
Block a user