summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* fix some memleaksmergeEdward Thomson2012-12-121-10/+16
|
* create dirs on writing conflicting filesEdward Thomson2012-12-111-16/+34
|
* updated to latestEdward Thomson2012-12-114-30/+33
|
* df conflictsEdward Thomson2012-12-112-82/+221
|
* merge refactor goodnessEdward Thomson2012-12-113-267/+440
|
* write side filesEdward Thomson2012-12-113-44/+148
|
* set up merge filenamesEdward Thomson2012-12-111-26/+120
|
* refactorEdward Thomson2012-12-114-359/+362
|
* rebased old mergeEdward Thomson2012-12-114-36/+1082
|
* treediffEdward Thomson2012-12-112-0/+308
|
* Fix iterator reset and add reset rangesRussell Belfer2012-12-107-113/+221
| | | | | | | The `git_iterator_reset` command has not been working in all cases particularly when there is a start and end range. This fixes it and adds tests for it, and also extends it with the ability to update the start/end range strings when an iterator is reset.
* Clean up iterator APIsRussell Belfer2012-12-109-33/+48
| | | | | | | | This removes the need to explicitly pass the repo into iterators where the repo is implied by the other parameters. This moves the repo to be owned by the parent struct. Also, this has some iterator related updates to the internal diff API to lay the groundwork for checkout improvements.
* Add git_cred_acquire_cb payload to winhttp transportBen Straub2012-12-101-1/+1
|
* Add a payload param to git_cred_acquire_cbBen Straub2012-12-107-6/+15
| | | Fixes #1128.
* Merge pull request #1126 from carlosmn/indexer-bufferVicent Martí2012-12-101-10/+9
|\ | | | | indexer: move the temporary buffers into the indexer object
| * indexer: move the temporary buffers into the indexer objectCarlos Martín Nieto2012-12-071-10/+9
| | | | | | | | | | | | Storing 4kB or 8kB in the stack is not very gentle. As this part has to be linear, put the buffer into the indexer object so we allocate it once in the heap.
* | orite C89Justin Spahr-Summers2012-12-091-2/+2
| |
* | Treat git_mutex_lock as successful when threads are disabledJustin Spahr-Summers2012-12-091-1/+1
| |
* | Always check the result of git_mutex_lockJustin Spahr-Summers2012-12-093-14/+51
| |
* | git__mwindow_mutex needs to be initialized even with pthreadsJustin Spahr-Summers2012-12-091-0/+2
|/ | | | This could also use PTHREAD_MUTEX_INITIALIZER, but a dynamic initializer seems like a more portable concept, and we won't need another #define on top of git_mutex_init()
* Merge pull request #1091 from carlosmn/stream-objectVicent Martí2012-12-075-59/+282
|\ | | | | Indexer speedup with large objects
| * indexer: correctly deal with objects larger than the window sizeCarlos Martín Nieto2012-11-301-19/+26
| | | | | | | | | | | | | | | | A mmap-window is not guaranteed to give you the whole object, but the indexer currently assumes so. Loop asking for more data until we've successfully CRC'd all of the packed data.
| * indexer: make use of streaming also for deltasCarlos Martín Nieto2012-11-301-49/+78
| | | | | | | | | | | | | | | | | | | | | | | | Up to now, deltas needed to be enterily in the packfile, and we tried to decompress then in their entirety over and over again. Adjust the logic so we read them as they come, just as we do for full objects. This also allows us to simplify the logic and have less nested code. The delta resolving phase still needs to decompress the whole object into memory, as there is not yet any streaming delta-apply support, but it helps in speeding up the downloading process and reduces the amount of memory allocations we need to do.
| * indexer: use the packfile streaming APICarlos Martín Nieto2012-11-303-30/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | The new API allows us to read the object bit by bit from the packfile, instead of needing it all at once in the packfile. This also allows us to hash the object as it comes in from the network instead of having to try to read it all and failing repeatedly for larger objects. This is only the first step, but it already shows huge improvements when dealing with objects over a few megabytes in size. It reduces the memory needs in some cases, but delta objects still need to be completely in memory and the old inefficent method is still used for that.
| * pack: introduce a streaming API for raw objectsCarlos Martín Nieto2012-11-302-0/+80
| | | | | | | | | | This allows us to take objects from the packfile as a stream instead of having to keep it all in memory.
* | tree: relax the filemode parserCarlos Martín Nieto2012-12-071-19/+26
| | | | | | | | | | | | | | | | | | | | | | There are many different broken filemodes in the wild so we need to protect against them and give something useful up the chain. Don't fail when reading a tree from the ODB but normalize the mode as best we can. As 664 is no longer a mode that we consider to be valid and gets normalized to 644, we can stop accepting it in the treebuilder. The library won't expose it to the user, so any invalid modes are a bug.
* | Fix diff header comments and missing constRussell Belfer2012-12-051-1/+1
| | | | | | | | | | | | Based on the recent work to wrap diff in objective-git, this includes a fix for a missing const and a number of clarifications of the documentation.
* | versions: MSVC build fixesVicent Marti2012-12-051-5/+5
| |
* | common: Silly vmg.Vicent Marti2012-12-051-1/+2
| |
* | common: Silly MSVCVicent Marti2012-12-051-1/+2
| |
* | Merge pull request #1115 from ben/struct-versionsVicent Martí2012-12-0521-36/+79
|\ \ | | | | | | Version info for public structs
| * | Don't unconstify when castingBen Straub2012-12-031-1/+1
| | |
| * | Remove GIT_SIGNATURE_VERSION and friendsBen Straub2012-12-036-18/+1
| | |
| * | Deploy GIT_INIT_STRUCTUREBen Straub2012-11-302-3/+11
| | |
| * | Deploy GITERR_CHECK_VERSIONBen Straub2012-11-3017-161/+38
| | |
| * | Deploy GIT_SIGNATURE_INITBen Straub2012-11-307-1/+38
| | |
| * | Deploy versioned git_transport structureBen Straub2012-11-303-3/+18
| | |
| * | Deploy GIT_STATUS_OPTIONS_INITBen Straub2012-11-302-8/+19
| | |
| * | Deploy GIT_REPOSITORY_INIT_OPTIONS_INITBen Straub2012-11-302-4/+17
| | |
| * | Deploy GIT_REMOTE_CALLBACKS_INITBen Straub2012-11-301-1/+18
| | |
| * | Deploy versioned git_odb_backend structureBen Straub2012-11-303-0/+18
| | |
| * | Deploy GIT_DIFF_FIND_OPTIONS_INITBen Straub2012-11-301-1/+17
| | |
| * | Deploy GIT_DIFF_OPTIONS_INITBen Straub2012-11-307-10/+26
| | |
| * | Deploy git_config_backend versionBen Straub2012-11-302-2/+17
| | |
| * | Deploy GIT_CHECKOUT_OPTS_INITBen Straub2012-11-303-6/+23
| |/
* | indentation fixEdward Thomson2012-12-041-3/+3
| |
* | hey don't stomp on my memory!Edward Thomson2012-12-041-3/+7
| |
* | status should ignore conflicts entries in the indexEdward Thomson2012-12-031-10/+30
| |
* | Merge pull request #1112 from barrbrain/odb-pack-read-headerVicent Martí2012-12-035-10/+95
|\ \ | | | | | | odb-pack: resurrect pack_backend__read_header
| * | odb-pack: resurrect pack_backend__read_headerDavid Michael Barr2012-12-031-10/+9
| | |
View Lorry Controller Status