summaryrefslogtreecommitdiff
path: root/src/diff_driver.c
Commit message (Collapse)AuthorAgeFilesLines
* diff: don't error out on an invalid regexcmn/regex-nofailCarlos Martín Nieto2015-08-151-7/+6
| | | | | | When parsing user-provided regex patterns for functions, we must not fail to provide a diff just because a pattern is not well formed. Ignore it instead.
* Fix checking of return value for regcomp.Patrick Steinhardt2015-04-101-1/+1
| | | | | | | | The regcomp function returns a non-zero value if compilation of a regular expression fails. In most places we only check for negative values, but positive values indicate an error, as well. Fix this tree-wide, fixing a segmentation fault when calling git_config_iterator_glob_new with an invalid regexp.
* config: borrow refcounted referencescmn/config-borrow-entryCarlos Martín Nieto2015-03-031-1/+2
| | | | | | | | | | | | | | | This changes the get_entry() method to return a refcounted version of the config entry, which you have to free when you're done. This allows us to avoid freeing the memory in which the entry is stored on a refresh, which may happen at any time for a live config. For this reason, get_string() has been forbidden on live configs and a new function get_string_buf() has been added, which stores the string in a git_buf which the user then owns. The functions which parse the string value takea advantage of the borrowing to parse safely and then release the entry.
* buffer: introduce git_buf_attach_notownedEdward Thomson2015-02-191-5/+4
| | | | | | Provide a convenience function that creates a buffer that can be provided to callers but will not be freed via `git_buf_free`, so the buffer creator maintains the allocation lifecycle of the buffer's contents.
* Remove extra semicolon outside of a functionStefan Widgren2015-02-151-1/+1
| | | | | Without this change, compiling with gcc and pedantic generates warning: ISO C does not allow extra ‘;’ outside of a function.
* Make our overflow check look more like gcc/clang'sEdward Thomson2015-02-131-4/+5
| | | | | | | | | Make our overflow checking look more like gcc and clang's, so that we can substitute it out with the compiler instrinsics on platforms that support it. This means dropping the ability to pass `NULL` as an out parameter. As a result, the macros also get updated to reflect this as well.
* allocations: test for overflow of requested sizeEdward Thomson2015-02-121-11/+31
| | | | | Introduce some helper macros to test integer overflow from arithmetic and set error message appropriately.
* Increase binary detection len to 8kRussell Belfer2014-05-161-1/+5
|
* Some coverity inspired cleanupsRussell Belfer2014-05-131-5/+5
|
* Minor fixes for warnings and error propagationRussell Belfer2014-05-121-1/+1
|
* repository: introduce a convenience config snapshot methodcmn/config-snapshotCarlos Martín Nieto2014-05-071-4/+1
| | | | | | Accessing the repository's config and immediately taking a snapshot of it is a common operation, so let's provide a convenience function for it.
* Use config snapshottingCarlos Martín Nieto2014-04-181-2/+6
| | | | | This way we can assume we have a consistent view of the config situation when we're looking up remote, branch, pack-objects, etc.
* Add diff threading tests and attr file cache locksRussell Belfer2014-04-171-1/+1
| | | | | | This adds a basic test of doing simultaneous diffs on multiple threads and adds basic locking for the attr file cache because that was the immediate problem that arose from these tests.
* Update Javascript userdiff driver and testsRussell Belfer2014-01-271-0/+1
| | | | | | | | | Writing a sample Javascript driver pointed out some extra whitespace handling that needed to be done in the diff driver. This adds some tests with some sample javascript code that I pulled off of GitHub just to see what would happen. Also, to clean up the userdiff test data, I did a "git gc" and packed up the test objects.
* Got some permission to use userdiff patternsRussell Belfer2014-01-241-38/+1
| | | | | | | | | | I contacted a number of Git authors and lined up their permission to relicense their work for use in libgit2 and copied over their code for diff driver xfuncname patterns. At this point, the code I've copied is taken verbatim from core Git although Thomas Rast warned me that the C++ patterns, at least, really need an update. I've left off patterns where I don't feel like I have permission at this point until I hear from more authors.
* Implement matched pattern extract for fn headersRussell Belfer2014-01-241-3/+8
|
* Import git drivers and test HTML driverRussell Belfer2014-01-241-16/+43
| | | | | | | | | | Reorganize the builtin driver table slightly so that core Git builtin definitions can be imported verbatim. Then take a few of the core Git drivers and pull them in. This also creates a test of diffs with the builtin HTML driver which led to some small error handling fixes in the driver selection logic.
* Initial take on builtin drivers with multilineRussell Belfer2014-01-241-42/+139
| | | | | | | | | | | | This extends the diff driver parser to support multiline driver definitions along with ! prefixing for negated matches. This brings the driver function pattern parsing in line with core Git. This also adds an internal table of driver definitions and a fallback code path that will look in that table for diff drivers that are set with attributes without having a definition in the config file. Right now, I just populated the table with a kind of simple HTML definition that is similar to the core Git def.
* Add config read fns with controlled error behaviorRussell Belfer2013-12-111-20/+19
| | | | | | | | | | | | | | | | | | | | | | | | This adds `git_config__lookup_entry` which will look up a key in a config and return either the entry or NULL if the key was not present. Optionally, it can either suppress all errors or can return them (although not finding the key is not an error for this function). Unlike other accessors, this does not normalize the config key string, so it must only be used when the key is known to be in normalized form (i.e. all lower-case before the first dot and after the last dot, with no invalid characters). This also adds three high-level helper functions to look up config values with no errors and a fallback value. The three functions are for string, bool, and int values, and will resort to the fallback value for any error that arises. They are: * `git_config__get_string_force` * `git_config__get_bool_force` * `git_config__get_int_force` None of them normalize the config `key` either, so they can only be used for internal cases where the key is known to be in normal format.
* config: get_multivar -> get_multivar_foreachCarlos Martín Nieto2013-08-081-2/+2
| | | | | The plain function will return an iterator, so move this one out of the way.
* Fix warnings on Win64Russell Belfer2013-07-111-1/+1
|
* Diff hunk context off by one on long linesRussell Belfer2013-07-051-3/+4
| | | | | | | | | | | The diff hunk context string that is returned to xdiff need not be NUL terminated because the xdiff code just copies the number of bytes that you report directly into the output. There was an off by one in the diff driver code when the header context was longer than the output buffer size, the output buffer length included the NUL byte which was copied into the hunk header. Fixes #1710
* Fix Windows warningsRussell Belfer2013-06-121-2/+2
| | | | | This fixes problems with missing function prototypes and 64-bit data issues on Windows.
* Improvements to git_arrayRussell Belfer2013-06-121-1/+1
| | | | | | | This changes the size data to uint32_t, fixes the array growth logic to use a simple 1.5x multiplier, and uses a generic inline function for growing the array to make the git_array_alloc API feel more natural (i.e. it returns a pointer to the new item).
* Fix some diff driver memory leaksRussell Belfer2013-06-121-16/+20
|
* Add diff drivers tests (and fix bugs)Russell Belfer2013-06-111-25/+40
| | | | | This adds real tests for user-configured diff drivers and in the process found a bunch of bugs.
* Implement regex pattern diff driverRussell Belfer2013-06-111-46/+236
| | | | | | | This implements the loading of regular expression pattern lists for diff drivers that search for function context in that way. This also changes the way that diff drivers update options and interface with xdiff APIs to make them a little more flexible.
* start implementing diff driver registryRussell Belfer2013-06-101-4/+40
|
* Reorganize diff and add basic diff driverRussell Belfer2013-06-101-0/+160
This is a significant reorganization of the diff code to break it into a set of more clearly distinct files and to document the new organization. Hopefully this will make the diff code easier to understand and to extend. This adds a new `git_diff_driver` object that looks of diff driver information from the attributes and the config so that things like function content in diff headers can be provided. The full driver spec is not implemented in the commit - this is focused on the reorganization of the code and putting the driver hooks in place. This also removes a few #includes from src/repository.h that were overbroad, but as a result required extra #includes in a variety of places since including src/repository.h no longer results in pulling in the whole world.