summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Move path prefixed help to path.hEdward Thomson2013-10-162-38/+41
| | | | | |
* | | | | | Move functions in checkout_conflicts to checkout.cEdward Thomson2013-10-163-729/+696
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seemed exceptionally silly to have a split there where no split needed to be.
* | | | | | Two-step conflict checkout (load / perform)Edward Thomson2013-10-163-71/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Honor UPDATE_ONLY bit when checking out conflictsEdward Thomson2013-10-163-4/+19
| | | | | |
* | | | | | Fix warning, fix memory leakEdward Thomson2013-10-161-8/+9
| | | | | |
* | | | | | Don't overwrite ~ files checking out conflictsEdward Thomson2013-10-161-30/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.)
* | | | | | Get rid of some quick hacksEdward Thomson2013-10-161-27/+21
| | | | | |
* | | | | | checkout rename conflictsEdward Thomson2013-10-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rename conflict tests for checkout conflicts, don't suffix filenames when checking out with USE_OURS or USE_THEIRS
* | | | | | checkout (from index) can write conflictsEdward Thomson2013-10-165-40/+677
| | | | | |
* | | | | | Merge pull request #1562 from libgit2/cmn/refs-namespace-lookupVicent Martí2013-10-111-1/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Provide the user with a more useful error code when a looking up a reference which name points to a namepace
| * | | | | futils: return GIT_ENOTFOUND when trying to read a directoryCarlos Martín Nieto2013-10-111-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets the reference code return not-found when the user asks to look up a reference when in fact they pass a namespace.
* | | | | | After iconv init reset ref normalize errorRussell Belfer2013-10-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The iconv init was accidentally clearing the default error state during reference normalization. This resets so that normalization errors will be detected correctly.
* | | | | | Merge pull request #1886 from libgit2/precompose-utf8Vicent Martí2013-10-0823-338/+643
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add support for core.precomposeunicode on Mac
| * | | | | | Rename new fn to git_repository_reinit_filesystemRussell Belfer2013-10-081-4/+4
| | | | | | |
| * | | | | | Make reference lookups apply precomposeunicodeRussell Belfer2013-10-083-28/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0811-138/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-042-29/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Update repo init with fewer platform assumptionsRussell Belfer2013-10-031-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Clean up annoying warningsRussell Belfer2013-10-032-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Wrap iconv stuff and write testsRussell Belfer2013-10-032-58/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Simplify git_path_is_empty_dir implementationRussell Belfer2013-10-031-28/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Initial iconv hookup for precomposed unicodeRussell Belfer2013-10-039-177/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Put hooks in place for precompose in dirload fnRussell Belfer2013-10-037-12/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Add check if we need to precompose unicode on MacRussell Belfer2013-10-031-32/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Combine WinHTTP API callsBen Straub2013-10-081-13/+7
| | | | | | |
* | | | | | | WinHTTP: set Accept header for POSTsBen Straub2013-10-081-1/+11
| | | | | | |
* | | | | | | tree: allow retrieval of raw attributesCarlos Martín Nieto2013-10-081-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Don't use git_atomic as an integerBen Straub2013-10-041-4/+5
| | | | | | |
* | | | | | | Use InterlockedCompareExchange for the lockPhilip Kelley2013-10-041-49/+18
| | | | | | |
* | | | | | | Posix synchronized init, prototype win32 versionBen Straub2013-10-041-34/+89
| | | | | | |
* | | | | | | index: Make _read() cope with index file creationnulltoken2013-10-041-2/+3
|/ / / / / /
* | | | | | Merge pull request #1888 from jamill/network_cancellationVicent Martí2013-10-036-62/+78
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | network cancellation improvements
| * | | | | Style tweaks and changes for code review feedbackJameson Miller2013-10-031-8/+6
| | | | | |
| * | | | | Support cancellation in push operationJameson Miller2013-10-026-61/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | | | Merge pull request #1887 from libgit2/ntk/topic/git_message_rawVicent Martí2013-10-032-6/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | commit: Introduce git_commit_message_raw()
| * | | | | | commit: Introduce git_commit_message_raw()nulltoken2013-10-032-6/+19
| |/ / / / /
* | | | | | HTTP: handle "relative" redirectsBen Straub2013-10-021-0/+10
|/ / / / /
* | | | | clone: put the callbacks struct directly in the clone optionsCarlos Martín Nieto2013-10-022-4/+3
| | | | | | | | | | | | | | | | | | | | There's no need for this to be a pointer to somewhere else.
* | | | | clone: bring back NULL as defaultsCarlos Martín Nieto2013-10-021-5/+9
| | | | | | | | | | | | | | | | | | | | This wasremoved as part of the large culling a few commits ago.
* | | | | clone: re-allow using a custom remote nameCarlos Martín Nieto2013-10-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | 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-023-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | 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/+3
| | | | | | | | | | | | | | | | | | | | | | | | | 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-43/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: implement git_clone on top of git_clone_intoCarlos Martín Nieto2013-10-021-58/+19
| | | | | | | | | | | | | | | | | | | | Unify the code bases.
* | | | | clone: remove the autotag optionCarlos Martín Nieto2013-10-021-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | 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-022-20/+20
| | | | |
* | | | | clone: implement git_clone_intoCarlos Martín Nieto2013-10-021-15/+63
| | | | | | | | | | | | | | | | | | | | | | | | | 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-024-17/+2
| | | | | | | | | | | | | | | | | | | | | | | | | 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-024-16/+7
| |/ / / |/| | | | | | | | | | | | | | | | | | | 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/+66
| | | |
View Lorry Controller Status