summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Initialize variablesBen Straub2013-10-301-2/+2
| | | | |
* | | | | Merge pull request #1919 from libgit2/cmn/multi-ack-detailedVicent Martí2013-10-303-29/+58
|\ \ \ \ \ | | | | | | | | | | | | protocol: basic support for multi_ack_detailed
| * | | | | protocol: basic support for multi_ack_detailedCarlos Martín Nieto2013-10-303-29/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tells the server that we speak it, but we don't make use of its extra information to determine if there's a better place to stop negotiating. In a somewhat-related change, reorder the capabilities so we ask for them in the same order as git does. Also take this opportunity to factor out a fairly-indented portion of the negotiation logic.
* | | | | | merge: any non-zero return from the user is an errorCarlos Martín Nieto2013-10-301-1/+1
|/ / / / / | | | | | | | | | | | | | | | This fixes #1703.
* | | | | pack-objects: Depth can be negativeVicent Marti2013-10-301-4/+3
|/ / / /
* | | | Merge pull request #1891 from libgit2/cmn/fix-thin-packsVicent Martí2013-10-289-80/+327
|\ \ \ \ | | | | | | | | | | Add support for thin packs
| * | | | indexer: include the delta statsCarlos Martín Nieto2013-10-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: inject one base at a timeCarlos Martín Nieto2013-10-081-27/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There may be multiple deltas referencing the same base as well as OFS deltas which rely on a thin delta. Deal with both at the same time by injecting a single object and going back up to the main delta-resolving loop.
| * | | | net: advertise our support for fixing thin packsCarlos Martín Nieto2013-10-043-1/+12
| | | | |
| * | | | indexer: fix thin packsCarlos Martín Nieto2013-10-044-40/+243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | pack: move the object header function hereCarlos Martín Nieto2013-10-043-35/+35
| | | | |
| * | | | indexer: do multiple passes over the delta listCarlos Martín Nieto2013-10-041-12/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Though unusual, a packfile may contain a delta whose base is a delta that comes later. In order index such a packfile, we must not give up on the first failure to resolve a delta, but keep it around. If there is a pass which makes no progress, this indicates that the packfile is broken, so fail accordingly.
* | | | | Merge pull request #1904 from libgit2/cmn/ssh-namingVicent Martí2013-10-282-25/+25
|\ \ \ \ \ | | | | | | | | | | | | Rename the ssh credentials
| * | | | | Rename the ssh credentialsCarlos Martín Nieto2013-10-232-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-288-336/+435
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make reflog part of refdb
| * | | | | | reflog: bring _append and _drop back to the frontendCarlos Martín Nieto2013-10-022-117/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These functions act purely on the reflog data structure.
| * | | | | | reflog: add a convenience append functionCarlos Martín Nieto2013-10-021-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-028-409/+520
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | The "common.h" should be included before "config.h".Cheng Zhao2013-10-283-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building libgit2 for ia32 architecture on a x64 machine, including "config.h" without a "common.h" would result the following error: C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2288): error C2373: 'InterlockedIncrement' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj] C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2295): error C2373: 'InterlockedDecrement' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj] C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2303): error C2373: 'InterlockedExchange' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj] C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2314): error C2373: 'InterlockedExchangeAdd' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj]
* | | | | | Use two calls to set two headersEdward Thomson2013-10-251-4/+17
| | | | | |
* | | | | | transport: let the progress output return an errorCarlos Martín Nieto2013-10-231-1/+4
| |/ / / / |/| | | | | | | | | | | | | | | | | | | 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-2216-518/+549
|\ \ \ \ \ | | | | | | | | | | | | RFC: Proposed reworking of diff APIs
| * | | | | Implement patience and minimal diff flagsRussell Belfer2013-10-211-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| * | | | | Fix warnings for win64Russell Belfer2013-10-211-5/+5
| | | | | |
| * | | | | Create git_diff_line and extend git_diff_hunkRussell Belfer2013-10-213-160/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-212-20/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-158-172/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1116-200/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+7
| | | | | |
* | | | | | Allowed credential types should be a bitfieldEdward Thomson2013-10-212-2/+3
| | | | | |
* | | | | | 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.
View Lorry Controller Status