git/git-add--interactive.perl, branch v1.6.2

add -p: get rid of Git.pm warnings about unitialized values

2009-02-08T21:06:33Z

After invoking git add -p I always got the warnings: Use of uninitialized value $_[3] in exec at Git.pm line 1282. Use of uninitialized value $args[2] in join or string at Git.pm line 1264. A bisect showed that these warnings occur in a301973 "add -p: print errors in separate color" the first time. They can be reproduced by setting color.ui (or color.interactive) to "auto" and unsetting color.interactive.help and color.interactive.error. I am using Perl 5.10.0. The reason of the warning is that color.interactive.error defaults to color.interactive.help which defaults to nothing in the specific codepath. It defaults to 'red bold' some lines above which could lead to the wrong assumption that it always defaults to 'red bold' now. This patch lets it default to 'red bold', blowing the warnings away. Signed-off-by: Stephan Beyer Acked-By: Thomas Rast Signed-off-by: Junio C Hamano

add -p: import Term::ReadKey with 'require'

2009-02-07T08:37:36Z

eval{use...} is no good because the 'use' is evaluated at compile time, so manually 'require' it. We need to forward declare the functions we use, otherwise Perl raises a compilation error. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

add -p: print errors in separate color

2009-02-06T01:44:39Z

Print interaction error messages in color.interactive.error, which defaults to the value of color.interactive.help. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

add -p: prompt for single characters

2009-02-06T01:44:10Z

Use Term::ReadKey, if available and enabled with interactive.singlekey, to let the user answer add -p's prompts by pressing a single key. We're not doing the same in the main 'add -i' interface because file selection etc. may expect several characters. Two commands take an argument: 'g' can easily cope since it'll just offer a choice of chunks. '/' now (unconditionally, even without readkey) offers a chance to enter a regex if none was given. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

add -p: trap Ctrl-D in 'goto' mode

2009-02-04T08:52:52Z

If the user hit Ctrl-D (EOF) while the script was in 'go to hunk?' mode, it threw an undefined variable error. Explicitly test for EOF and have it re-enter the goto prompt loop. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

add -p: change prompt separator for 'g'

2009-02-04T08:52:27Z

57886bc (git-add -i/-p: Change prompt separater from slash to comma, 2008-11-27) changed the prompt separator to ',', but forgot to adapt the 'g' (goto) command. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

In add --patch, Handle K,k,J,j slightly more gracefully.

2009-02-02T03:43:38Z

Instead of printing the help menu, this will print "No next hunk" and then process the given hunk again. Signed-off-by: William Pursell Signed-off-by: Junio C Hamano

Add / command in add --patch

2009-02-02T03:43:38Z

This command allows the user to skip hunks that don't match the specified regex. Signed-off-by: William Pursell Signed-off-by: Junio C Hamano

git-add -i/-p: Change prompt separater from slash to comma

2009-02-02T03:43:37Z

Otherwise the find command '/' soon to be introduced will be hard to see. Signed-off-by: William Pursell Signed-off-by: Junio C Hamano

Add 'g' command to go to a hunk

2008-12-05T01:59:45Z

When a minor change is made while the working directory is in a bit of a mess, it is somewhat difficult to wade through all of the hunks using git add --patch. This allows one to jump to the hunk that needs to be staged without having to respond 'n' to each preceding hunk. Signed-off-by: William Pursell Signed-off-by: Junio C Hamano