summaryrefslogtreecommitdiff
path: root/include/git2
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1918 from libgit2/cmn/indexer-namingVicent Martí2013-11-012-9/+9
|\ | | | | indexer: remove the stream infix
| * indexer: remove the stream infixCarlos Martín Nieto2013-10-302-9/+9
| | | | | | | | | | | | | | | | | | | | | | It was there to keep it apart from the one which read in from a file on disk. This other indexer does not exist anymore, so there is no need for anything other than git_indexer to refer to it. While here, rename _add() function to _append() and _finalize() to _commit(). The former change is cosmetic, while the latter avoids talking about "finalizing", which OO languages use to mean something completely different.
* | Fix saving remotes with several fetch/push ref specs.Daniel Rodríguez Troitiño2013-11-012-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At some moment git_config_delete_entry lost the ability to delete one entry of a multivar configuration. The moment you had more than one fetch or push ref spec for a remote you will not be able to save that remote anymore. The changes in network::remote::remotes::save show that problem. I needed to create a new git_config_delete_multivar because I was not able to remove one or several entries of a multivar config with the current API. Several tries modifying how git_config_set_multivar(..., NULL) behaved were not successful. git_config_delete_multivar is very similar to git_config_set_multivar, and delegates into config_delete_multivar of config_file. This function search for the cvar_t that will be deleted, storing them in a temporal array, and rebuilding the linked list. After calling config_write to delete the entries, the cvar_t stored in the temporal array are freed. There is a little fix in config_write, it avoids an infinite loop when using a regular expression (case for the multivars). This error was found by the test network::remote::remotes::tagopt.
* | Remove leftover function declarationCarlos Martín Nieto2013-10-301-15/+0
|/
* Merge pull request #1891 from libgit2/cmn/fix-thin-packsVicent Martí2013-10-283-1/+15
|\ | | | | Add support for thin packs
| * indexer: include the delta statsCarlos Martín Nieto2013-10-231-0/+2
| | | | | | | | | | | | | | | | | | | | The user is unable to derive the number of deltas in the pack, as that would require them to capture the stats exactly in the moment between download and final processing, which is abstracted away in the fetch. Capture these numbers for the user and expose them in the progress struct. The clone and fetch examples now also present this information to the user.
| * indexer: clearer stats for thin packsCarlos Martín Nieto2013-10-111-0/+7
| | | | | | | | | | | | | | Don't increase the number of total objects, as it can produce suprising progress output. The only addition compared to pre-thin is the addition of local_objects to allow an output similar to git's "completed with %d local objects".
| * indexer: fix thin packsCarlos Martín Nieto2013-10-043-1/+6
| | | | | | | | | | | | When given an ODB from which to read objects, the indexer will attempt to inject the missing bases at the end of the pack and update the header and trailer to reflect the new contents.
* | Merge pull request #1904 from libgit2/cmn/ssh-namingVicent Martí2013-10-281-16/+26
|\ \ | | | | | | Rename the ssh credentials
| * | Rename the ssh credentialsCarlos Martín Nieto2013-10-231-16/+26
| | | | | | | | | | | | | | | | | | The names from libssh2 are somewhat obtuse for us. We can simplify the usual key/passphrase credential's name, as well as make clearer what the custom signature function is.
* | | Merge pull request #1802 from libgit2/cmn/reflog-backendBen Straub2013-10-283-8/+69
|\ \ \ | | | | | | | | Make reflog part of refdb
| * | | reflog: bring _append and _drop back to the frontendCarlos Martín Nieto2013-10-021-12/+0
| | | | | | | | | | | | | | | | These functions act purely on the reflog data structure.
| * | | reflog: add a convenience append functionCarlos Martín Nieto2013-10-021-0/+17
| | | | | | | | | | | | | | | | | | | | Provide a function that reads a reflog, performs an append and writes back to the backend in one call.
| * | | reflog: move the reflog implementation into refdb_fsCarlos Martín Nieto2013-10-023-8/+64
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | References and their logs are logically coupled, let's make it so in the code by moving the fs-based reflog implementation to live next to the fs-based refs one. As part of the change, make the function take names rather than references, as only the names are relevant when looking up and handling reflogs.
* | | transport: let the progress output return an errorCarlos Martín Nieto2013-10-232-2/+2
| |/ |/| | | | | | | There are any number of issues that can come up in the progress callback, and we should let the user cancel at that point as well.
* | Merge pull request #1897 from libgit2/split-patch-from-diffVicent Martí2013-10-223-486/+555
|\ \ | | | | | | RFC: Proposed reworking of diff APIs
| * | Fix typoRussell Belfer2013-10-221-1/+1
| | |
| * | Implement patience and minimal diff flagsRussell Belfer2013-10-211-1/+4
| | | | | | | | | | | | | | | | | | It seems that to implement these options, we just have to pass the appropriate flags through to the libxdiff code taken from core git. So let's do it (and add a test).
| * | Create git_diff_line and extend git_diff_hunkRussell Belfer2013-10-212-25/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of having functions with so very many parameters to pass hunk and line data, this takes the existing git_diff_hunk struct and extends it with more hunk data, plus adds a git_diff_line. Those structs are used to pass back hunk and line data instead of the old APIs that took tons of parameters. Some work that was previously only being done for git_diff_patch creation (scanning the diff content for exact line counts) is now done for all callbacks, but the performance difference should not be noticable.
| * | Tweak to git_diff_delta structure for nfilesRussell Belfer2013-10-211-2/+3
| | | | | | | | | | | | | | | | | | While the base git_diff_delta structure always contains two files, when we introduce conflict data, it will be helpful to have an indicator when an additional file is involved.
| * | Diff API cleanupRussell Belfer2013-10-152-195/+230
| | | | | | | | | | | | | | | | | | | | | | | | This lays groundwork for separating formatting options from diff creation options. This groups the formatting flags separately from the diff list creation flags and reorders the options. This also tweaks some APIs to further separate code that uses patches from code that just looks at git_diffs.
| * | Rename diff objects and split patch.hRussell Belfer2013-10-113-310/+342
| | | | | | | | | | | | | | | | | | This makes no functional change to diff but renames a couple of the objects and splits the new git_patch (formerly git_diff_patch) into a new header file.
* | | Implement `git_odb_object_dup`Vicent Marti2013-10-221-0/+14
| | |
* | | Allowed credential types should be a bitfieldEdward Thomson2013-10-211-10/+15
| | |
* | | checkout (from index) can write conflictsEdward Thomson2013-10-161-7/+10
|/ /
* | Merge pull request #1886 from libgit2/precompose-utf8Vicent Martí2013-10-082-5/+23
|\ \ | | | | | | Add support for core.precomposeunicode on Mac
| * | Rename new fn to git_repository_reinit_filesystemRussell Belfer2013-10-081-2/+2
| | |
| * | Make reference lookups apply precomposeunicodeRussell Belfer2013-10-083-24/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before these changes, looking up a reference would return the same precomposed or decomposed form of the reference name that was used to look it up, so on MacOS which ignores the difference between the two, a single reference could be looked up either way and git_reference_name would return the form of the name that was used to look it up! This change makes lookup always return the precomposed name if core.precomposeunicode is set regardless of which version was used to look it up. The reference iterator was already returning the precomposed form from earlier work. This also updates the CMakeLists.txt rules for enabling iconv usage because the clar tests for this code were actually not being activated properly with the old version. Finally, this moves git_repository_reset_filesystem from include/ git2/repository.h to include/git2/sys/repository.h since it is not really a function that normal library users should have to think about very often.
| * | More filemode cleanups for FAT on MacOSRussell Belfer2013-10-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This cleans up some additional issues. The main change is that on a filesystem that doesn't support mode bits, libgit2 will now create new blobs with GIT_FILEMODE_BLOB always instead of being at the mercy to the filesystem driver to report executable or not. This means that if "core.filemode" lies and claims that filemode is not supported, then we will ignore the executable bit from the filesystem. Previously we would have allowed it. This adds an option to the new git_repository_reset_filesystem to recurse through submodules if desired. There may be other types of APIs that would like a "recurse submodules" option, but this one is particularly useful. This also has a number of cleanups, etc., for related things including trying to give better error messages when problems come up from the filesystem. For example, the FAT filesystem driver on MacOS appears to return errno EINVAL if you attempt to write a filename with invalid UTF-8 in it. We try to capture that with a better error message now.
| * | Add git_repository_reset_filesystem and fix testsRussell Belfer2013-10-041-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a repository is transferred from one file system to another, many of the config settings that represent the properties of the file system may be wrong. This adds a new public API that will refresh the config settings of the repository to account for the change of file system. This doesn't do a full "reinitialize" and operates on a existing git_repository object refreshing the config when done. This commit then makes use of the new API in clar as each test repository is set up. This commit also has a number of other clar test fixes where we were making assumptions about the type of filesystem, either based on outdated config data or based on the OS instead of the FS.
* | | tree: allow retrieval of raw attributesCarlos Martín Nieto2013-10-081-0/+11
| | | | | | | | | | | | | | | | | | When a tool needs to recreate the tree object (for example an interface to another VCS), it needs to use the raw attributes, forgoing any normalization.
* | | index: Enhance documentationnulltoken2013-10-041-0/+3
|/ /
* | Merge pull request #1888 from jamill/network_cancellationVicent Martí2013-10-032-2/+2
|\ \ | | | | | | network cancellation improvements
| * | Support cancellation in push operationJameson Miller2013-10-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds cancellation for the push operation. This work consists of: 1) Support cancellation during push operation - During object counting phase - During network transfer phase - Propagate GIT_EUSER error code out to caller 2) Improve cancellation support during fetch - Handle cancellation request during network transfer phase - Clear error string when cancelled during indexing 3) Fix error handling in git_smart__download_pack Cancellation during push is still only handled in the pack building and network transfer stages of push (and not during packbuilding).
* | | commit: Introduce git_commit_message_raw()nulltoken2013-10-031-0/+11
|/ /
* | clone: put the callbacks struct directly in the clone optionsCarlos Martín Nieto2013-10-022-3/+3
| | | | | | | | There's no need for this to be a pointer to somewhere else.
* | remote: add some comments to the callback structCarlos Martín Nieto2013-10-021-1/+33
| | | | | | | | Hopefully clear up what they're for.
* | clone: mention clone_into in the clone documentationCarlos Martín Nieto2013-10-021-2/+5
| | | | | | | | Make the difference more explicit.
* | clone: re-allow using a custom remote nameCarlos Martín Nieto2013-10-021-17/+5
| | | | | | | | | | This is a small thing that by itself doesn't quite justify making the user use clone_into.
* | clone: const-ify checkout optionsCarlos Martín Nieto2013-10-022-2/+2
| | | | | | | | | | The removal of many options which lead to the direct usage of the user's checkout options means we should make sure they remain const.
* | clone: re-add a way to ignore certificate errorsCarlos Martín Nieto2013-10-021-0/+1
| | | | | | | | | | This used to be done via transport flags, which was removed in a previous commit.
* | clone: remove more options from basic cloneCarlos Martín Nieto2013-10-021-7/+0
| | | | | | | | | | | | The basic clone function is there to make it easy to create a "normal" clone. Remove a bunch of options that are about changing the remote's configuration.
* | clone: remove the autotag optionCarlos Martín Nieto2013-10-021-3/+0
| | | | | | | | | | Downloading all tags is part of what makes it a clone instead of simply a fetch.
* | remote: add a convenience 'fetch' function.Carlos Martín Nieto2013-10-021-0/+11
| |
* | clone: implement git_clone_intoCarlos Martín Nieto2013-10-021-0/+16
| | | | | | | | | | This allows you to set up the repository and remote as you which to have them before performing the clone operation.
* | remote: move the credentials callback to the structCarlos Martín Nieto2013-10-022-5/+1
| | | | | | | | | | Move this one as well, letting us have a single way of setting the callbacks for the remote, and removing fields from the clone options.
* | remote: put the _download() callback with the othersCarlos Martín Nieto2013-10-022-11/+2
|/ | | | | | The text progress and update_tips callbacks are already part of the struct, which was meant to unify the callback setup, but the download one was left out.
* Add git_transport_register, git_transport_unregisterPhilip Kelley2013-10-011-0/+34
|
* Initial Implementation of progress reports during pushJameson Miller2013-09-302-0/+59
| | | | | | | | | | | | | | | | | | | | | | This adds the basics of progress reporting during push. While progress for all aspects of a push operation are not reported with this change, it lays the foundation to add these later. Push progress reporting can be improved in the future - and consumers of the API should just get more accurate information at that point. The main areas where this is lacking are: 1) packbuilding progress: does not report progress during deltafication, as this involves coordinating progress from multiple threads. 2) network progress: reports progress as objects and bytes are going to be written to the subtransport (instead of as client gets confirmation that they have been received by the server) and leaves out some of the bytes that are transfered as part of the push protocol. Basically, this reports the pack bytes that are written to the subtransport. It does not report the bytes sent on the wire that are received by the server. This should be a good estimate of progress (and an improvement over no progress).
* That's the refdb, it's not the odb...Edward Thomson2013-09-251-2/+2
|