Files
git/Documentation
Zoltan Klinger ee7fb0b1d4 difftool: display the number of files in the diff queue in the prompt
When --prompt option is set, git-difftool displays a prompt for each
modified file to be viewed in an external diff program.  At that
point, it could be useful to display a counter and the total number
of files in the diff queue.

Below is the current difftool prompt for the first of 5 modified files:

    Viewing: 'diff.c'
    Launch 'vimdiff' [Y/n]:

Consider the modified prompt:

    Viewing (1/5): 'diff.c'
    Launch 'vimdiff' [Y/n]:

The current GIT_EXTERNAL_DIFF mechanism does not tell the number of
paths in the diff queue nor the current counter.  To make this
"counter/total" info available for GIT_EXTERNAL_DIFF programs
without breaking existing ones by doing the following:

 - Keep track of the number of paths shown so far in diff_options;

 - Export two new environment variables from run_external_diff() to
   show the total number of paths (from diff_queue_struct) and the
   current value of the counter (from diff_options); and

 - Update git-difftool--helper to use these two environment variables.

Signed-off-by: Zoltan Klinger <zoltan.klinger@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-06 14:00:27 -08:00
..
2013-11-20 11:26:59 -08:00
2013-10-23 13:21:31 -07:00
2013-10-23 13:21:48 -07:00
2013-07-22 16:06:48 -07:00
2013-02-14 10:29:01 -08:00
2013-09-17 11:42:51 -07:00
2013-09-04 12:23:25 -07:00
2012-06-19 11:35:19 -07:00
2013-09-09 14:50:36 -07:00
2013-10-23 13:21:31 -07:00
2013-09-17 11:42:51 -07:00
2011-09-06 11:42:12 -07:00
2013-05-29 14:23:04 -07:00
2013-04-12 12:00:52 -07:00
2013-10-18 13:50:12 -07:00
2011-03-11 10:59:16 -05:00
2013-04-12 12:00:52 -07:00
2013-10-23 13:21:48 -07:00
2013-10-22 11:23:31 -07:00
2013-06-09 13:45:32 -07:00
2013-07-22 16:06:48 -07:00
2013-09-20 12:38:10 -07:00
2013-09-17 11:42:54 -07:00