summaryrefslogtreecommitdiff
path: root/src/xdiff
Commit message (Collapse)AuthorAgeFilesLines
* Spelling fixesWill Stamper2014-12-042-2/+2
|
* Merge branch 'new-error-handling' into developmentVicent Martí2012-05-023-7/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .travis.yml include/git2/diff.h src/config_file.c src/diff.c src/diff_output.c src/mwindow.c src/path.c tests-clar/clar_helpers.c tests-clar/object/tree/frompath.c tests/t00-core.c tests/t03-objwrite.c tests/t08-tag.c tests/t10-refs.c tests/t12-repo.c tests/t18-status.c tests/test_helpers.c tests/test_main.c
| * Fix warnings on 64-bit windows buildsRussell Belfer2012-04-173-7/+7
| | | | | | | | | | This fixes all the warnings on win64 except those in deps, which come from the regex code.
* | Check for _WIN32 instead of GIT_WIN32 or WIN32 to detect windows build ↵Sven Strickroth2012-04-211-1/+1
| | | | | | | | | | | | | | | | environments This fixes a possible compilation issue (when GIT_WIN32 was not set) which was introduced in revision 69a4bc1988fc242bd0d310781c865cce5481a0e6. Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | WIN32 is not always defined, use GIT_WIN32 insteadSven Strickroth2012-04-201-1/+1
|/ | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* Update diff to use iteratorsRussell Belfer2012-03-021-2/+2
| | | | | | | | | | | | | This is a major reorganization of the diff code. This changes the diff functions to use the iterators for traversing the content. This allowed a lot of code to be simplified. Also, this moved the functions relating to outputting a diff into a new file (diff_output.c). This includes a number of other changes - adding utility functions, extending iterators, etc. plus more tests for the diff code. This also takes the example diff.c program much further in terms of emulating git-diff command line options.
* Initial implementation of git_diff_blobRussell Belfer2012-03-021-1/+5
| | | | | | | | This gets the basic plumbing in place for git_diff_blob. There is a known issue where additional parameters like the number of lines of context to display on the diff are not working correctly (which leads one of the new unit tests to fail).
* Eliminate xdiff compiler warningsRussell Belfer2012-03-024-13/+26
| | | | | This cleans up the various GCC compiler warnings with the xdiff code that was copied in.
* Import xdiff library from gitRussell Belfer2012-03-0215-0/+3542
This is the initial import of the xdiff code (LGPL) from core git as of rev f349b562086e2b7595d8a977d2734ab2ef9e71ef