Log

Author Commit Date CI Message
Carlos Martín Nieto 5cb13670 2013-10-23T15:45:29 transport: let the progress output return an error 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.
Vicent Martí 1c74686e 2013-10-22T11:55:54 Merge pull request #1897 from libgit2/split-patch-from-diff RFC: Proposed reworking of diff APIs
Russell Belfer 7ce60099 2013-10-22T11:12:44 Fix typo
Vicent Marti 98fec8a9 2013-10-22T16:05:47 Implement `git_odb_object_dup`
Russell Belfer 5de4ec81 2013-10-21T15:36:38 Implement patience and minimal diff flags 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).
Russell Belfer 623460ab 2013-10-21T14:16:53 Fix warnings for win64
Russell Belfer 3b5f7954 2013-10-21T13:42:42 Create git_diff_line and extend git_diff_hunk 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.
Vicent Martí 86774742 2013-10-21T13:06:27 Merge pull request #1903 from ethomson/ssh Allowed credential types should be a bitfield
Edward Thomson 2648dc1a 2013-10-21T11:03:31 Allowed credential types should be a bitfield
Russell Belfer 74a627f0 2013-10-21T09:07:19 Tweak to git_diff_delta structure for nfiles 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.
Vicent Martí 901c34f2 2013-10-18T10:00:26 Merge pull request #1900 from haneefmubarak/patch-1 license clarification + formatting all over
Haneef Mubarak caf93341 2013-10-17T16:01:43 slightly clarified the "license" portion of `README.md" + formatting all over fixed typo `can can` -> `can`
Haneef Mubarak e5e2710b 2013-10-17T01:52:20 slightly clarified the "license" portion of `README.md" + formatting all over added the second change suggested by @nulltoken (with two extra words :) )
Haneef Mubarak 20b5d300 2013-10-17T00:28:08 slightly clarified the "license" portion of `README.md" + formatting all over There are commercial open source applications, hence proprietary seems to be a better term. Also: - Trimmed header `=`'s to match text length - made libgit2 stand out everywhere - pretty printing links - irc link for those with the correct setup
Vicent Martí b2c9e41a 2013-10-16T13:51:24 Merge pull request #1702 from ethomson/checkout_merge Checkout merge
Edward Thomson c929d6b7 2013-10-09T18:26:42 Move path prefixed help to path.h
Edward Thomson 7fa73de1 2013-09-23T17:52:40 Move functions in checkout_conflicts to checkout.c It seemed exceptionally silly to have a split there where no split needed to be.
Edward Thomson 216f97e4 2013-09-23T09:47:47 Two-step conflict checkout (load / perform) Move conflict handling into two steps: load the conflicts and then apply the conflicts. This is more compatible with the existing checkout implementation and makes progress reporting more sane.
Edward Thomson cfae7f85 2013-08-09T20:23:36 Honor UPDATE_ONLY bit when checking out conflicts
Edward Thomson 6f8cc7bb 2013-08-05T20:06:09 Fix warning, fix memory leak
Edward Thomson e47f859d 2013-08-08T16:46:49 Don't overwrite ~ files checking out conflicts If a D/F conflict or rename 2->1 conflict occurs, we write the file sides as filename~branchname. If a file with that name already exists in the working directory, write as filename~branchname_0 instead. (Incrementing 0 until a unique filename is found.)
Edward Thomson fc36800e 2013-08-08T13:16:13 Get rid of some quick hacks
Edward Thomson 96d799aa 2013-07-23T15:32:42 checkout rename conflicts rename conflict tests for checkout conflicts, don't suffix filenames when checking out with USE_OURS or USE_THEIRS
Edward Thomson 4f7897ab 2013-07-22T08:51:29 Prevent checkout_tree when conflicts exist, clear NAME on checkout tree Prevent checkout tree when unresolved changes exist (unless FORCE flag is specified). Clear NAME table when checking out, to avoid checkout_conflicts from attempting to manipulate it. Ensure that NAME is also cleared at reset.
Edward Thomson 629b661c 2013-07-17T09:49:56 checkout (from index) can write conflicts
Edward Thomson 3acf44d6 2013-07-17T09:43:32 tests for checkout index with conflicts
Russell Belfer 10672e3e 2013-10-15T15:10:07 Diff API cleanup 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.
Russell Belfer 3ff1d123 2013-10-11T14:51:54 Rename diff objects and split patch.h 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.
Vicent Martí 2c2b0ebb 2013-10-11T09:47:05 Merge pull request #1562 from libgit2/cmn/refs-namespace-lookup Provide the user with a more useful error code when a looking up a reference which name points to a namepace
Carlos Martín Nieto 7c9f5bec 2013-08-17T07:11:31 futils: return GIT_ENOTFOUND when trying to read a directory This lets the reference code return not-found when the user asks to look up a reference when in fact they pass a namespace.
Ben Straub 4d43e630 2013-10-10T15:29:57 Merge pull request #1898 from arthurschreiber/patch-2 Fix a typo in the rpm build instructions.
Arthur Schreiber 84c46981 2013-10-11T00:06:08 Fix a typo in the rpm build instructions.
Russell Belfer 74353137 2013-10-09T11:57:03 After iconv init reset ref normalize error The iconv init was accidentally clearing the default error state during reference normalization. This resets so that normalization errors will be detected correctly.
Vicent Martí 95c148b2 2013-10-08T17:03:12 Merge pull request #1886 from libgit2/precompose-utf8 Add support for core.precomposeunicode on Mac
Russell Belfer 867f7c9b 2013-10-08T16:59:59 Rename new fn to git_repository_reinit_filesystem
Russell Belfer 92dac975 2013-10-08T16:35:57 Make reference lookups apply precomposeunicode 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.
Vicent Martí 062c95c2 2013-10-08T16:32:06 Merge pull request #1895 from libgit2/winhttp-accept WinHTTP: set Accept header for POSTs
Ben Straub 3dc3c723 2013-10-08T15:52:37 Combine WinHTTP API calls
Russell Belfer d5e83627 2013-10-08T14:41:32 Case sensitivity issues on Linux A couple of tests were actually dealing incorrectly with case sensitivity issues on Linux because they were relying on having core.ignorecase set to true. Now that the fixture initialization sets the case sensitivity to be accurate for the platform, it exposed bugs in these tests.
Ben Straub 1fd21b03 2013-10-08T13:59:43 Add Assembla unit test
Ben Straub a58eecd4 2013-10-08T13:40:52 WinHTTP: set Accept header for POSTs
Russell Belfer 14997dc5 2013-10-08T12:45:43 More filemode cleanups for FAT on MacOS 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.
Vicent Martí ca27ae48 2013-10-08T04:31:26 Merge pull request #1894 from libgit2/cmn/tree-raw tree: allow retrieval of raw attributes
Carlos Martín Nieto 13f670a5 2013-04-15T09:07:57 tree: allow retrieval of raw attributes 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.
Vicent Martí 711333ef 2013-10-05T07:56:03 Merge pull request #1890 from libgit2/multiple-init Multiple init
Ben Straub 22661448 2013-10-04T19:35:32 Don't use git_atomic as an integer
Philip Kelley cdc95a0d 2013-10-04T18:38:37 Use InterlockedCompareExchange for the lock
Ben Straub e411b74e 2013-10-04T19:33:48 Posix synchronized init, prototype win32 version
Ben Straub cfd192b0 2013-10-03T12:44:34 Add test for multiple thread init/shutdown
Russell Belfer 5173ea92 2013-10-04T16:32:16 Add git_repository_reset_filesystem and fix tests 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.
Vicent Martí ec5fe2da 2013-10-04T08:50:44 Merge pull request #1892 from libgit2/ntk/topic/index_read Make git_index_read() cope with external additions and removals of the index file
nulltoken da7b78fa 2013-10-04T14:03:12 index: Make _read() cope with index file creation
nulltoken 6445ae99 2013-10-04T13:49:26 index: Enhance documentation
nulltoken 34b8eafc 2013-10-04T11:36:40 Tabify indentations
Russell Belfer b8f9059d 2013-10-03T15:16:06 More cleanups to remove WIN assumptions This cleans up more of the test suite to check actual filesystem behavior instead of relying on Windows vs. Mac vs. Linux to test.
Russell Belfer 840fb4fc 2013-10-03T14:42:37 Update repo init with fewer platform assumptions The repo init code was assuming Windows == no filemode, and Mac or Windows == no case sensitivity. Those assumptions are not consistently true depending on the mounted file system. This is a first step to removing those assumptions. It focuses on the repo init code and the tests of that code. There are still many other tests that are broken when those assumptions don't hold true, but this clears up one area of the code. Also, this moves the core.precomposeunicode logic to be closer to the current logic in core Git where it will be set to true on any filesystem where composed unicode is decomposed when read back.
Russell Belfer af302aca 2013-10-02T14:13:11 Clean up annoying warnings The indexer code was generating warnings on Windows 64-bit. I looked closely at the logic and was able to simplify it a bit. Also this fixes some other Windows and Linux warnings.
Russell Belfer 618b7689 2013-10-02T12:06:26 Wrap iconv stuff and write tests This adds a simple wrapper around the iconv APIs and uses it instead of the old code that was inlining the iconv stuff. This makes it possible for me to test the iconv logic in isolation. A "no iconv" version of the API was defined with macros so that I could have fewer ifdefs in the code itself.
Russell Belfer d0849f83 2013-10-02T11:07:18 Simplify git_path_is_empty_dir implementation This simplifies git_path_is_empty_dir on both Windows (getting rid of git_buf allocation inside the function) and other platforms (by just using git_path_direach), and adds tests for the function, and uses the function to simplify some existing tests.
Russell Belfer 966bb17a 2013-10-01T16:41:07 Add to Git authors who have agreed to relicense In email, Torsten Bögershausen agreed that we could use his code from core Git in libgit2 under the modified license. Also, since his work is the basis for much of the precompose unicode support, I have added him to the AUTHORS file as well.
Russell Belfer 219d3457 2013-10-01T16:12:15 Initial iconv hookup for precomposed unicode This hooks up git_path_direach and git_path_dirload so that they will take a flag indicating if directory entry names should be tested and converted from decomposed unicode to precomposed form. This code will only come into play on the Apple platform and even then, only when certain types of filesystems are used. This involved adding a flag to these functions which involved changing a lot of places in the code. This was an opportunity to do a bit of code cleanup here and there, for example, getting rid of the git_futils_cleanupdir_r function in favor of a simple flag to git_futils_rmdir_r to not remove the top level entry. That ended up adding depth tracking during rmdir_r which led to a safety check for infinite directory recursion. Yay. This hasn't actually been tested on the Mac filesystems where the issue occurs. I still need to get test environment for that.
Russell Belfer 2fe54afa 2013-09-30T16:58:33 Put hooks in place for precompose in dirload fn This doesn't actual do string precompose but it puts the hooks in place into the iterators and the git_path_dirload function so that the actual precompose work is ready to go.
Russell Belfer 6b7991e2 2013-09-30T16:13:53 Add check if we need to precompose unicode on Mac This adds initialization of core.precomposeunicode to repo init on Mac. This is necessary because when a Mac accesses a repo on a VFAT or SAMBA file system, it will return directory entries in decomposed unicode even if the filesystem entry is precomposed. This also removes caching of a number of repo properties from the repo init pipeline because these are properties of the specific filesystem on which the repo is created, not of the system as a whole.
Vicent Martí 146b4d1c 2013-10-03T08:18:41 Merge pull request #1888 from jamill/network_cancellation network cancellation improvements
Jameson Miller 7baa7631 2013-10-02T15:39:18 Style tweaks and changes for code review feedback
Vicent Martí ab136876 2013-10-03T04:36:29 Merge pull request #1887 from libgit2/ntk/topic/git_message_raw commit: Introduce git_commit_message_raw()
nulltoken 598f069b 2013-10-02T12:42:41 commit: Introduce git_commit_message_raw()
Russell Belfer c8f2ba99 2013-10-02T15:26:20 Merge pull request #1889 from libgit2/relative-redirect HTTP: handle "relative" redirects
Ben Straub 41a6de28 2013-10-02T14:45:57 HTTP: handle "relative" redirects
Jameson Miller 83db7e09 2013-10-02T15:10:39 Fix broken online push tests
Jameson Miller 5b188225 2013-10-02T13:45:32 Support cancellation in push operation 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).
Vicent Martí 5bfead1d 2013-10-02T05:56:37 Merge pull request #1855 from libgit2/cmn/clone-into An alternative for 'clone' with options
Carlos Martín Nieto 0e0cf787 2013-10-02T14:04:44 clone: put the callbacks struct directly in the clone options There's no need for this to be a pointer to somewhere else.
Carlos Martín Nieto ffc97d51 2013-09-20T23:23:42 remote: add some comments to the callback struct Hopefully clear up what they're for.
Carlos Martín Nieto 36a241ac 2013-09-20T23:14:52 clone: mention clone_into in the clone documentation Make the difference more explicit.
Carlos Martín Nieto fdc7e5e3 2013-09-20T23:14:12 clone: bring back NULL as defaults This wasremoved as part of the large culling a few commits ago.
Carlos Martín Nieto c833893c 2013-09-20T22:57:01 clone: re-allow using a custom remote name This is a small thing that by itself doesn't quite justify making the user use clone_into.
Carlos Martín Nieto eec1c1fe 2013-09-20T22:49:20 clone: const-ify checkout options 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.
Carlos Martín Nieto b9bf5d70 2013-09-20T22:46:32 clone: re-add a way to ignore certificate errors This used to be done via transport flags, which was removed in a previous commit.
Carlos Martín Nieto 6ac15eff 2013-09-20T22:34:05 clone: remove more options from basic clone 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.
Carlos Martín Nieto e3a92f0d 2013-09-17T05:31:34 clone: implement git_clone on top of git_clone_into Unify the code bases.
Carlos Martín Nieto c8dbec48 2013-09-16T18:42:53 clone: remove the autotag option Downloading all tags is part of what makes it a clone instead of simply a fetch.
Carlos Martín Nieto fe3a40a4 2013-09-16T16:54:37 remote: add a convenience 'fetch' function.
Carlos Martín Nieto d19870d9 2013-09-16T05:10:55 clone: implement git_clone_into This allows you to set up the repository and remote as you which to have them before performing the clone operation.
Carlos Martín Nieto e3c131c5 2013-09-16T05:02:25 remote: move the credentials callback to the struct 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.
Carlos Martín Nieto d31402a3 2013-09-16T04:20:05 remote: put the _download() callback with the others 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.
Vicent Martí 71e33d26 2013-10-01T14:00:30 Merge pull request #1885 from ethomson/transport_register Add git_transport_register, git_transport_unregister
Philip Kelley 83786956 2013-01-04T14:39:05 Add git_transport_register, git_transport_unregister
Ben Straub 816d28e7 2013-10-01T12:56:47 Mark git__timer as inline on OSX
Vicent Martí c655aa52 2013-10-01T05:54:54 Merge pull request #1882 from linquize/config-subsection-fix Config subsection name should allow to have ']' and '\\' should allow to escape any characters
Linquize 8d741253 2013-10-01T09:46:56 Add negative test cases for config header with invalid characters
Linquize d52a93fa 2013-09-30T23:58:58 Add test case to test ']' and '\\' characters in config subsection
Linquize 566dd8ce 2013-09-30T23:38:22 Config subsection name should allow to have ']' and '\\' should allow to escape any characters
Vicent Martí fba14763 2013-09-30T15:03:35 Merge pull request #1879 from libgit2/redir-refactor Redir refactor
Vicent Martí a6884b6f 2013-09-30T14:58:45 Merge pull request #1412 from jamill/push_progress Initial Implementation of progress reports during push
Vicent Martí 9acde162 2013-09-30T14:57:48 Merge pull request #1881 from libgit2/ignore-submodules-in-stash Never consider submodules for stashing
Ben Straub ae5a9352 2013-09-30T14:47:56 Ensure submodule repos and indices are freed ...before the helper's cleanup method tries to delete their files.
Vicent Martí dc56fea7 2013-09-30T12:18:19 Merge pull request #1878 from libgit2/ntk/fix/warnings Fix x86/x64 size_t related warnings
Jameson Miller b176eded 2013-09-19T14:52:57 Initial Implementation of progress reports during push 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).
Vicent Martí 5b09db15 2013-09-30T09:40:15 Merge pull request #1883 from libgit2/ntk/fix/empty_first_commit_line Remove leading newlines from commit message