user/sven/git.git/xdiff, branch v1.4.4.4

Increase length of function name buffer

2006-11-24T06:51:41Z

In xemit.c:xdl_emit_diff() a buffer for showing the function name as commentary is allocated; this buffer was 40 characters. This is a bit small; particularly for C++ function names where there is often an identical prefix (like void LongNamespace::LongClassName) on multiple functions, which makes the context the same everywhere. In other words the context is useless. This patch increases that buffer to 80 characters - which may still not be enough, but is better Signed-off-by: Andy Parkins Signed-off-by: Junio C Hamano

xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines

2006-10-25T19:57:33Z

This removes the '#' and '(' tests and adds a '$' test instead although I have no idea what it is actually good for - but hey, if that's what GNU diff does... Pasky only went and did as Junio sayeth. Signed-off-by: Petr Baudis Signed-off-by: Junio C Hamano

xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.

2006-10-23T21:33:54Z

This removes trailing blanks from git-generated diff headers the same way a similar patch did that for GNU diff: http://article.gmane.org/gmane.comp.gnu.utils.bugs/13839 That is, it removes trailing blanks on the hunk header line that shows the function name. Signed-off-by: Jim Meyering Signed-off-by: Junio C Hamano

Merge branch 'maint'

2006-10-17T04:58:54Z

* maint: Fix hash function in xdiff library

Fix hash function in xdiff library

2006-10-17T04:27:44Z

Jim Mayering noticed that xdiff library took insanely long time when comparing files with many identical lines. This was because the hash function used in the library is broken on 64-bit architectures and caused too many collisions. http://thread.gmane.org/gmane.comp.version-control.git/28962/focus=28994 Acked-by: Davide Libenzi Signed-off-by: Junio C Hamano

diff: fix 2 whitespace issues

2006-10-12T16:30:14Z

When whitespace or whitespace change was ignored, the function xdl_recmatch() returned memcmp() style differences, which is wrong, since it should return 0 on non-match. Also, there were three horrible off-by-one bugs, even leading to wrong hashes in the whitespace special handling. The issue was noticed by Ray Lehtiniemi. For good measure, this commit adds a test. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'lt/merge-tree'

2006-07-13T05:31:22Z

* lt/merge-tree: Improved three-way blob merging code Prepare "git-merge-tree" for future work xdiff: generate "anti-diffs" aka what is common to two files

Fix more typos, primarily in the code

2006-07-10T07:36:44Z

The only visible change is that git-blame doesn't understand "--compability" anymore, but it does accept "--compatibility" instead, which is already documented. Signed-off-by: Pavel Roskin Signed-off-by: Junio C Hamano

xdiff: generate "anti-diffs" aka what is common to two files

2006-06-29T05:24:32Z

This fairly trivial patch adds a new XDL_EMIT_xxx flag to tell libxdiff that we don't want to generate the _diff_ between two files, we want to see the lines that are _common_ to two files. So when you set XDL_EMIT_COMMON, xdl_diff() will do everything exactly like it used to do, but the output records it generates just contain the lines that aren't part of the diff. This is for doing things like generating the common base case for a file that was added in both branches. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

Teach diff about -b and -w flags

2006-06-24T00:35:27Z

This adds -b (--ignore-space-change) and -w (--ignore-all-space) flags to diff. The main part of the patch is teaching libxdiff about it. [jc: renamed xdl_line_match() to xdl_recmatch() since the former is used for different purposes in xpatchi.c which is in the parts of the upstream source we do not use.] Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano