user/sven/git.git/combine-diff.c, branch v1.5.6.4

Merge branch 'jc/maint-combine-diff-pre-context' into maint

2008-06-25T18:20:01Z

* jc/maint-combine-diff-pre-context: diff -c/--cc: do not include uninteresting deletion before leading context

diff -c/--cc: do not include uninteresting deletion before leading context

2008-06-19T06:59:41Z

When we include a few uninteresting lines before the interesting ones as context, we are only interested in seeing the surviving lines themselves and not the deleted lines that are before them. Mark the added leading context lines in give_context() and not show deleted lines form them. Signed-off-by: Junio C Hamano

Cleanup xread() loops to use read_in_full()

2008-05-04T05:15:25Z

Signed-off-by: Heikki Orsila Signed-off-by: Junio C Hamano

Remove dead code: show_log() sep argument and diff_options.msg_sep

2008-05-03T18:48:03Z

These variables were made unnecessary by commit 3969cf7db1a13a78f3b7a36d8c1084bbe0a53459. Signed-off-by: Adam Simpkins Signed-off-by: Junio C Hamano

Die for an early EOF in a file reading loop

2008-04-28T05:24:55Z

The resulting data is zero terminated after the read loop, but the subsequent loop that scans for '\n' will overrun the buffer. Signed-off-by: Heikki Orsila Signed-off-by: Junio C Hamano

Fix rewrite_diff() name quoting.

2007-12-27T01:13:36Z

This moves the logic to quote two paths (prefix + path) in C-style introduced in the previous commit from the dump_quoted_path() in combine-diff.c to quote.c, and uses it to fix rewrite_diff() that never C-quoted the pathnames correctly. Signed-off-by: Junio C Hamano

combine-diff: Fix path quoting

2007-12-27T00:51:19Z

Earlier when showing combined diff, the filenames on the ---/+++ header lines were quoted incorrectly. a/ (or b/) prefix was output literally and then the path was output, with c-quoting. This fixes the quoting logic, and while at it, adjusts the code to use the customizable prefix (a_prefix and b_prefix) introduced recently. Signed-off-by: Junio C Hamano

xdl_diff: identify call sites.

2007-12-14T07:04:26Z

This inserts a new function xdi_diff() that currently does not do anything other than calling the underlying xdl_diff() to the callchain of current callers of xdl_diff() function. Signed-off-by: Junio C Hamano

Make the diff_options bitfields be an unsigned with explicit masks.

2007-11-12T00:54:15Z

reverse_diff was a bit-value in disguise, it's merged in the flags now. Signed-off-by: Pierre Habouzit Signed-off-by: Junio C Hamano

Full rework of quote_c_style and write_name_quoted.

2007-09-21T06:45:49Z

* quote_c_style works on a strbuf instead of a wild buffer. * quote_c_style is now clever enough to not add double quotes if not needed. * write_name_quoted inherits those advantages, but also take a different set of arguments. Now instead of asking for quotes or not, you pass a "terminator". If it's \0 then we assume you don't want to escape, else C escaping is performed. In any case, the terminator is also appended to the stream. It also no longer takes the prefix/prefix_len arguments, as it's seldomly used, and makes some optimizations harder. * write_name_quotedpfx is created to work like write_name_quoted and take the prefix/prefix_len arguments. Thanks to those API changes, diff.c has somehow lost weight, thanks to the removal of functions that were wrappers around the old write_name_quoted trying to give it a semantics like the new one, but performing a lot of allocations for this goal. Now we always write directly to the stream, no intermediate allocation is performed. As a side effect of the refactor in builtin-apply.c, the length of the bar graphs in diffstats are not affected anymore by the fact that the path was clipped. Signed-off-by: Pierre Habouzit