The callback to supply data chunks could return a negative value
to stop creation of the blob, but we were neither using GIT_EUSER
nor propagating the return value. This makes things use the new
behavior of returning the negative value back to the user.
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.
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.
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.
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.
Apologies for the delay. This release is chunky,
but you're probably used to chunky releases by now.
Full changelog follows:
Internal changes
+ Added support for decomposed Unicode paths in Mac OS X
+ Added support for junctions in win32
+ Fixed issues with HTTP redirects in the network stack
+ Performance improvements (as always)
git2/blame.h
+ added full support for blame operations
git2/blob.h
+ added `git_blob_filtered_content` to load blobs in
memory with their corresponding filters applied
git2/branch.h
+ added branch iterators as an alternative to the
callback-based API
git2/buffer.h
+ exported the git_buf struct to allow binary buffers
to be passed from/to the library. This simplifies
several APIs
git2/checkout.h
+ implemented additional checkout options ('skip unmerged',
'use ours' and 'use theirs')
git2/clone.h
+ simplified the clone API
+ added new `git_clone_into` to clone into an existing
(empty) repository
git2/commit.h
+ added APIs to access the raw (uncleaned) text of a commit
message
git2/common.h
+ added global options to set the default paths to load
templates from
git2/config.h
+ added multivar iterators
+ added globbing iterator
+ added `git_config_foreach_match` to perform operations
on every single var in a config file
git2/diff.h
+ restructured and simplified the diff API
git2/filter.h
+ added external APIs to configure and apply custom filters
to checked out blobs
git2/index.h
+ `git_index_read` can now force a reload of the index file
even if it hasn't changed on-disk
git2/indexer.h
+ improved the streaming indexer APIs
git2/merge.h
+ added support for merge!
git2/object.h
+ added helper API to lookup a generic object by path
git2/pack.h
+ added progress callbacks to the packbuilder
git2/patch.h
+ added support for patch generation as part of the Diff
API revamp
git2/pathspec.h
+ added helper APIs to work with pathspecs and match files
in the workdir or diffs
git2/push.h
+ added progress callbacks to push
git2/reflog.h
+ changed reflog APIs to work on reference names instead of
the references themselves, so they become less racy
git2/remote.h
+ added support for setting refspecs on remotes, either at
creation or on existing ones
+ simplified the remotes API
git2/revwalk.h
+ add API to simplify parents during a walk
git2/signature.h
+ add helper to create a signature with the default values for
a repository (i.e. the set `user.name` and `user.email` values,
and the current time)
git2/submodules.h
+ improve the status detection for submodules
git2/sys/
+ exported many new internal APIs, such as pluggabe transport
APIs
-vmg, out
The callback-based method of listing remote references dates back to the
beginning of the network code's lifetime, when we didn't know any
better.
We need to keep the list around for update_tips() after disconnect() so
let's make use of this to simply give the user a pointer to the array so
they can write straightforward code instead of having to go through a
callback.
Removing arbitrary refspecs makes things more complex to reason
about. Instead, let the user set the fetch and push refspec list to
whatever they want it to be.
Create a git_branch_iterator type which is equivalent to the foreach but
lets us write loops instead of callbacks.
Since the introduction of git_reference_shorthand(), the added value of
passing the name is reduced.
There are a number of cases where it is convenient to be able to
fetch and "claim" the current error string, clearing the error.
This is helpful when you need to call some code that may alter
the error and you want to restore it later on and/or report it via
some other mechanism.
In git_checkout_tree, the first check tests if either repo or treeish is
NULL and says that eithor of them has to have a valid value. But there
is no code to handle the treeish == NULL case.
So, do something meaningful in that case: use HEAD instead.
The correct behaviour when a remote has no refspecs (e.g. a URL from the
command-line) is to download the remote's HEAD. Let's do that.
This fixes#1261.
Sometimes the static initializer for git_diff_options cannot be
used and since setting them to all zeroes doesn't actually work
quite right, this adds a new helper for that situation.
This also adds an explicit new value to the submodule settings
options to be used when those enums need static initialization.
This changes `git_index_read` to have two modes - a hard index
reload that always resets the index to match the on-disk data
(which was the old behavior) and a soft index reload that uses
the timestamp / file size information and only replaces the index
data if the file on disk has been modified.
This then updates the git_status code to do a soft reload unless
the new GIT_STATUS_OPT_NO_REFRESH flag is passed in.
This also changes the behavior of the git_diff functions that use
the index so that when an index is not explicitly passed in (i.e.
when the functions call git_repository_index for you), they will
also do a soft reload for you.
This intentionally breaks the file signature of git_index_read
because there has been some confusion about the behavior previously
and it seems like all existing uses of the API should probably be
examined to select the desired behavior.
