- 11 Dec, 2013 8 commits
-
-
Russell Belfer committed
-
This changes the behavior of callbacks so that the callback error code is not converted into GIT_EUSER and instead we propagate the return value through to the caller. Instead of using the giterr_capture and giterr_restore functions, we now rely on all functions to pass back the return value from a callback. To avoid having a return value with no error message, the user can call the public giterr_set_str or some such function to set an error message. There is a new helper 'giterr_set_callback' that functions can invoke after making a callback which ensures that some error message was set in case the callback did not set one. In places where the sign of the callback return value is meaningful (e.g. positive to skip, negative to abort), only the negative values are returned back to the caller, obviously, since the other values allow for continuing the loop. The hardest parts of this were in the checkout code where positive return values were overloaded as meaningful values for checkout. I fixed this by adding an output parameter to many of the internal checkout functions and removing the overload. This added some code, but it is probably a better implementation. There is some funkiness in the network code where user provided callbacks could be returning a positive or a negative value and we want to rely on that to cancel the loop. There are still a couple places where an user error might get turned into GIT_EUSER there, I think, though none exercised by the tests.
Russell Belfer committed -
There are a lot of places that we call git__free on each item in a vector and then call git_vector_free on the vector itself. This just wraps that up into one convenient helper function.
Russell Belfer committed -
This continues auditing all the places where GIT_EUSER is being returned and making sure to clear any existing error using the new giterr_user_cancel helper. As a result, places that relied on intercepting GIT_EUSER but having the old error preserved also needed to be cleaned up to correctly stash and then retrieve the actual error. Additionally, as I encountered places where error codes were not being propagated correctly, I tried to fix them up. A number of those fixes are included in the this commit as well.
Russell Belfer committed -
This adds giterr_user_cancel to return GIT_EUSER and clear any error message that is sitting around. As a result of using that in places, we need to be more thorough with capturing errors that happen inside a callback when used internally. To help with that, this also adds giterr_capture and giterr_restore so that when we internally use a foreach-type function that clears errors and converts them to GIT_EUSER, it is easier to restore not just the return value, but the actual error message text.
Russell Belfer committed -
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.
Russell Belfer committed -
Rename detection using diff.renames
Russell Belfer committed -
Ben Straub committed
-
- 09 Dec, 2013 2 commits
-
-
Clean up warnings
Vicent Marti committed -
Edward Thomson committed
-
- 08 Dec, 2013 4 commits
-
-
commit: Fix potential segfault
Edward Thomson committed -
Dereferencing commit pointer before asserting
Paul Holden committed -
Fixed left shift size of int.
Vicent Marti committed -
Simply switched the ordering of the checks in the for loop where this left shift was being made.
Jared Wong committed
-
- 06 Dec, 2013 5 commits
-
-
Ben Straub committed
-
Ben Straub committed
-
Ben Straub committed
-
blame.c: Remove unnecessary error-check and goto
Vicent Martí committed -
In private function 'load_blob'.
Paul Holden committed
-
- 05 Dec, 2013 5 commits
-
-
Ben Straub committed
-
Ben Straub committed
-
Fixed compilation on Windows when using libssh2.
Vicent Martí committed -
mgbowen committed
-
Ben Straub committed
-
- 03 Dec, 2013 9 commits
-
-
Reorder revert test variable decls
Edward Thomson committed -
Oh, MSVC.
Edward Thomson committed -
Bare naked merge and rebase
Vicent Martí committed -
Edward Thomson committed
-
Include git2/revert.h in git2.h
Vicent Martí committed -
Linquize committed
-
Updates to cancellation logic during download and indexing of packfile.
Vicent Martí committed -
Revert support for a single commit
Vicent Martí committed -
Jameson Miller committed
-
- 02 Dec, 2013 7 commits
-
-
Edward Thomson committed
-
Edward Thomson committed
-
Add GIT_DIFF_FIND_REMOVE_UNMODIFIED flag and fix copy detection bug
Vicent Martí committed -
Russell Belfer committed
-
When doing copy detection, it is often necessary to include UNMODIFIED records in the git_diff so they are available as source records for GIT_DIFF_FIND_COPIES_FROM_UNMODIFIED. Yet in the final diff, often you will not want to have these UNMODIFIED records. This adds a flag which marks these UNMODIFIED records for deletion from the diff list so they will be removed after the rename detect phase is over.
Russell Belfer committed -
When FIND_COPIES is used in combination with BREAK_REWRITES for rename detection, there was a bug where the split MODIFIED delta was only used as a target for RENAME records and not for COPIED records. This fixes that, converting the split into a pair of DELETED and COPIED deltas when that circumstance arises.
Russell Belfer committed -
Improve iconv finding for cmake
Vicent Martí committed
-