summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | path: don't let direach overwrite the callback's error messageCarlos Martín Nieto2015-05-151-1/+3
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | This function deals with functions doing IO which means the amount of errors that can happen is quit large. It does not help if it always ovewrites the underlying error message with a less understandable version of "something went wrong". Instead, only use this generic message if there was no error set by the callback.
* | | Make "Early EOF" message start with lowercaseMarius Ungureanu2015-05-141-2/+2
| | |
* | | local: plug a leak in the progress reportingCarlos Martín Nieto2015-05-141-1/+5
| | |
* | | push: fix the update constructorcmn/push-notify-deletedCarlos Martín Nieto2015-05-141-3/+4
|/ / | | | | | | | | There was a copypasta error and the source and destination IDs were reversed.
* | Merge pull request #3119 from ethomson/ignoreCarlos Martín Nieto2015-05-132-38/+20
|\ \ | | | | | | Attributes: don't match files for folders
| * | attr: declare variable at top of block for msvcEdward Thomson2015-05-121-1/+3
| | |
| * | attr: less path mangling during attribute matchingEdward Thomson2015-05-121-40/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When handling attr matching, simply compare the directory path where the attribute file resides to the path being matched. Skip over commonality to allow us to compare the contents of the attribute file to the remainder of the path. This allows us to more easily compare the pattern directly to the path, instead of trying to guess whether we want to compare the path's basename or the full path based on whether the match was inside a containing directory or not. This also allows us to do fewer translations on the pattern (trying to re-prefix it.)
| * | attr: don't mangle file path during attr matchingEdward Thomson2015-05-121-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When determining whether some file matches an attr pattern, do not try to truncate the path to pass to fnmatch. When there is no containing directory for an item (eg, from a .gitignore in the root) this will cause us to truncate our path, which means that we cannot do meaningful comparisons on it and we may have false positives when trying to determine whether a given file is actually a file or a folder (as we have lost the path's base information.) This mangling was to allow fnmatch to compare a directory on disk to the name of a directory, but it is unnecessary as our fnmatch accepts FNM_LEADING_DIR.
| * | attr: always return errorsEdward Thomson2015-05-121-1/+2
| | |
| * | attr: don't match files for foldersEdward Thomson2015-05-121-0/+8
| | | | | | | | | | | | | | | When ignoring a path "foo/", ensure that this is actually a directory, and not simply a file named "foo".
* | | Merge pull request #3103 from libgit2/cmn/local-push-messageEdward Thomson2015-05-131-56/+22
|\ \ \ | | | | | | | | Use the packbuilder in local push
| * | | local: use the packbuilder to pushCarlos Martín Nieto2015-05-131-55/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of copying each object individually, as we'd been doing, use the packbuilder which should be faster and give us some feedback. While performing this change, we can hook up the packbuilder's writing to the push progress so the caller knows how far along we are.
| * | | local: add clarification for non-bare push restrictionCarlos Martín Nieto2015-05-131-1/+4
| | | |
* | | | Merge pull request #3102 from libgit2/cmn/pack-objects-reportEdward Thomson2015-05-133-0/+58
|\ \ \ \ | | | | | | | | | | Show progress during packing for the local transport
| * | | | packbuilder: report progress during deltificationcmn/pack-objects-reportCarlos Martín Nieto2015-05-132-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful to send to the client while we're performing the work. The reporting function has a force parameter which makes sure that we do send out the message of 100% completed, even if this comes before the next udpate window.
| * | | | local: send the packbuilder progress via the sidebandCarlos Martín Nieto2015-05-131-0/+29
| |/ / / | | | | | | | | | | | | | | | | Set a callback for the packbuilder so we can send the sideband messages to the caller, formatting them as git would.
* | | | Merge pull request #3118 from libgit2/cmn/stream-sizeEdward Thomson2015-05-134-9/+15
|\ \ \ \ | | | | | | | | | | odb: make the writestream's size a git_off_t
| * | | | odb: make the writestream's size a git_off_tcmn/stream-sizeCarlos Martín Nieto2015-05-134-9/+15
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restricting files to size_t is a silly limitation. The loose backend writes to a file directly, so there is no issue in using 63 bits for the size. We still assume that the header is going to fit in 64 bytes, which does mean quite a bit smaller files due to the run-length encoding, but it's still a much larger size than you would want Git to handle.
* | | | Fix a few leaksCarlos Martín Nieto2015-05-131-4/+8
| | | | | | | | | | | | | | | | | | | | The interesting one is the notification macro, which was returning directly on a soft-abort instead of going through the cleanup.
* | | | Merge pull request #3120 from libgit2/cmn/backends-prioEdward Thomson2015-05-131-3/+6
|\ \ \ \ | |_|/ / |/| | | odb: reverse the default backend priorities
| * | | odb: reverse the default backend prioritiescmn/backends-prioCarlos Martín Nieto2015-05-131-3/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently first look in the loose object dir and then in the packs for objects. When performing operations on recent history this has a higher likelihood of hitting, but when we deal with operations which look further back into the past, we start spending a large amount of time getting ENOTENT from `access`. Reversing the priorities means that long-running operations can get to their objects faster, as we can look at the index data we have in memory (or rather mapped) to figure out whether we have an object, which is faster than going out to the filesystem. The packed backend already implements an optimistic read algorithm by first looking at the packs we know about and only going out to disk to referesh if the object is not found which means that in the case where we do have the object (which will be in the majority for anything that traverses the graph) we can avoid going to to disk entirely to determine whether an object exists. Operations which look at recent history may take a slight impact, but these would be operations which look a lot less at object and thus take less time regardless.
* | | push: free the update listCarlos Martín Nieto2015-05-131-0/+8
| | |
* | | remote: simplify anonymous creationCarlos Martín Nieto2015-05-131-8/+1
| | | | | | | | | | | | | | | We're down to simply having it be a call to create_internal() so let's simply do that. The rest of the code is just a distraction.
* | | remote: remove git_remote_save()Carlos Martín Nieto2015-05-132-27/+0
| | | | | | | | | | | | | | | It has now become a no-op, so remove the function and all references to it.
* | | remote: remove live changing of refspecsCarlos Martín Nieto2015-05-132-33/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The base refspecs changing can be a cause of confusion as to what is the current base refspec set and complicate saving the remote's configuration. Change `git_remote_add_{fetch,push}()` to update the configuration instead of an instance. This finally makes `git_remote_save()` a no-op, it will be removed in a later commit.
* | | remote: move the tagopt setting to the fetch optionsCarlos Martín Nieto2015-05-133-52/+71
| | | | | | | | | | | | | | | This is another option which we should not be keeping in the remote, but is specific to each particular operation.
* | | remote: move the update_fetchhead setting to the optionsCarlos Martín Nieto2015-05-133-22/+13
| | | | | | | | | | | | | | | | | | While this will rarely be different from the default, having it in the remote adds yet another setting it has to keep around and can affect its behaviour. Move it to the options.
* | | remote: move the transport ctor to the callbacksCarlos Martín Nieto2015-05-132-24/+5
| | | | | | | | | | | | | | | | | | | | | Instead of having it set in a different place from every other callback, put it the main structure. This removes some state from the remote and makes it behave more like clone, where the constructors are passed via the options.
* | | remote: add prune option to fetchCarlos Martín Nieto2015-05-131-1/+11
| | | | | | | | | | | | | | | Add a prune setting in the fetch options to allow to fall back to the configuration (the default) or to set it on or off.
* | | remote: remove url and pushurl from the save logicCarlos Martín Nieto2015-05-131-35/+53
| | | | | | | | | | | | | | | | | | As a first step in removing the repository-saving logic, don't allow chaning the url or push url from a remote object, but change the configuration on the configuration immediately.
* | | Remove the callbacks struct from the remoteCarlos Martín Nieto2015-05-1311-103/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having the setting be different from calling its actions was not a great idea and made for the sake of the wrong convenience. Instead of that, accept either fetch options, push options or the callbacks when dealing with the remote. The fetch options are currently only the callbacks, but more options will be moved from setters and getters on the remote to the options. This does mean passing the same struct along the different functions but the typical use-case will only call git_remote_fetch() or git_remote_push() and so won't notice much difference.
* | | push: remove own copy of callbacksCarlos Martín Nieto2015-05-134-75/+14
|/ / | | | | | | | | | | | | | | | | The push object knows which remote it's associated with, and therefore does not need to keep its own copy of the callbacks stored in the remote. Remove the copy and simply access the callbacks struct within the remote.
* | Merge pull request #3111 from whoisj/centralizing-buffer-sizesCarlos Martín Nieto2015-05-127-9/+12
|\ \ | | | | | | Centralizing all IO buffer size values
| * | centralizing all IO buffer size valuesJ Wyman2015-05-117-9/+12
| |/
* | stash: propagate the error when writing a treeEdward Thomson2015-05-111-1/+1
| |
* | stash_apply: provide progress callbacksEdward Thomson2015-05-111-3/+23
| |
* | stash_apply: provide its own options structureEdward Thomson2015-05-111-28/+35
| |
* | stash apply: default to at least GIT_CHECKOUT_SAFEEdward Thomson2015-05-111-2/+3
| |
* | stash: return GIT_EMERGECONFLICT on merge conflictEdward Thomson2015-05-111-3/+1
| |
* | stash: refactor to use merge_iteratorsEdward Thomson2015-05-111-172/+93
| |
* | stash: ensure a reflog has entriesEdward Thomson2015-05-111-2/+2
| |
* | stash apply: check out a tree, not piecewiseEdward Thomson2015-05-111-32/+11
| |
* | stash: use git_commit_summary for a summaryEdward Thomson2015-05-111-12/+4
| |
* | index: introduce git_index_read_indexEdward Thomson2015-05-112-0/+100
| |
* | checkout: allow baseline to be specified as indexEdward Thomson2015-05-111-5/+14
| | | | | | | | | | | | Allow the baseline to be specified as an index, so that users need not write their index to a tree just to checkout with that as the baseline.
* | merge: merge iteratorsEdward Thomson2015-05-112-24/+80
| |
* | Added git_stash_apply() and git_stash_pop() APIsPierre-Olivier Latour2015-05-111-0/+371
|/
* Merge pull request #3104 from whoisj/optimal-buffer-sizeCarlos Martín Nieto2015-05-091-1/+1
|\ | | | | Adjusting stream buffer size to 64KB
| * Adjusting stream buffer size to 64KBJ Wyman2015-05-071-1/+1
| | | | | | | | 64K is optimal buffer size per https://technet.microsoft.com/en-us/library/cc938632.aspx
* | config: plug a couple of leaksCarlos Martín Nieto2015-05-051-4/+7
| |