summaryrefslogtreecommitdiff
path: root/xdiff-interface.h
Commit message (Collapse)AuthorAgeFilesLines
* Per-path attribute based hunk header selection.Junio C Hamano2007-07-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This makes"diff -p" hunk headers customizable via gitattributes mechanism. It is based on Johannes's earlier patch that allowed to define a single regexp to be used for everything. The mechanism to arrive at the regexp that is used to define hunk header is the same as other use of gitattributes. You assign an attribute, funcname (because "diff -p" typically uses the name of the function the patch is about as the hunk header), a simple string value. This can be one of the names of built-in pattern (currently, "java" is defined) or a custom pattern name, to be looked up from the configuration file. (in .gitattributes) *.java funcname=java *.perl funcname=perl (in .git/config) [funcname] java = ... # ugly and complicated regexp to override the built-in one. perl = ... # another ugly and complicated regexp to define a new one. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Move buffer_is_binary() to xdiff-interface.hJohannes Schindelin2007-06-041-0/+1
| | | | | | | | We already have two instances where we want to determine if a buffer contains binary data as opposed to text. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* move read_mmfile() into xdiff-interfaceJohannes Schindelin2006-12-211-0/+1
| | | | | | | | read_file() was a useful function if you want to work with the xdiff stuff, so it was renamed and put into a more central place. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Match ofs/cnt types in diff interface.Junio C Hamano2006-04-061-2/+2
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* combine-diff: move the code to parse hunk-header into common library.Junio C Hamano2006-04-051-0/+3
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* combine-diff: refactor built-in xdiff interface.Junio C Hamano2006-04-051-0/+18
This refactors the line-by-line callback mechanism used in combine-diff so that other programs can reuse it more easily. Signed-off-by: Junio C Hamano <junkio@cox.net>