Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2010-09-15JGit 0.9.1v0.9.1Matthias Sohn27-168/+168
Change-Id: Ic411b1b8a7e6039ae3ff567e2c9cdd5db84f4d41 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-14Fix PlotCommitList to set lanes on child-less commitsChristian Halstrick2-15/+385
In PlotCommitList.enter() commits are positioned on lanes for visual presentation. This implementation was buggy: commits without children (often the starting points for the RevWalk) are not positioned on separate lanes. The problem was that when handling commits with multiple children (that's where branches fork out) it was not handled that some of the children may not have been positioned on a lane yet. I fixed that and added a number of tests which specifically test the layout of commits on lanes. Bug: 300282 Bug: 320263 Change-Id: I267b97ecccb5251cec54cec90207e075ab50503e Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-11Correct Javadoc for WS_IGNORE_CHANGE comparatorShawn O. Pearce1-1/+1
Change-Id: I8aa1e7c7ae192ed28b2c8aaa3c5884b7b4666e9c Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-09Merge changes I3668a396,I18f48321,I121f356cMatthias Sohn10-192/+402
* changes: Unpack and cache large deltas as loose objects Remember loose objects and fast-track their lookup Correctly name DeltaBaseCache
2010-09-08Update .eclipse_iplog for 0.9Matthias Sohn1-0/+5
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-09-08Unpack and cache large deltas as loose objectsShawn O. Pearce5-61/+105
Instead of spooling large delta bases into temporary files and then immediately deleting them afterwards, spool the large delta out to a normal loose object. Later any requests for that large delta can be answered by reading from the loose object, which is much easier to stream efficiently for readers. Since the object is now duplicated, once in the pack as a delta and again as a loose object, any future prune-packed will automatically delete the loose object variant, releasing the wasted disk space. As prune-packed is run automatically during either repack or gc, and gc --auto triggers automatically based on the number of loose objects, we get automatic cache management for free. Large objects that were unpacked will be periodically cleared out, and will simply be restored later if they are needed again. After a short offline discussion with Junio Hamano today, we may want to propose a change to prune-packed to hold onto larger loose objects which also exist in pack files as deltas, if the loose object was recently accessed or modified in the last 2 days. Change-Id: I3668a3967c807010f48cd69f994dcbaaf582337c Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-08Remember loose objects and fast-track their lookupShawn O. Pearce3-2/+176
Recently created objects are usually what branches point to, and are usually written out as loose objects. But due to the high cost of asking the operating system if a file exists, these are the last thing that ObjectDirectory examines when looking for an object by its ObjectId. Caching recently seen loose objects permits the opening code to jump directly to the loose object, accelerating lookup for branch heads that are accessed often. To avoid exploding the cache its limited to approximately 2048 entries. When more ids are added, the table is simply cleared and reset in size. Change-Id: I18f483217412b102f754ffd496c87061d592e535 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-08Correctly name DeltaBaseCacheShawn O. Pearce4-16/+8
This class is used only to cache the unpacked form of an object that was used as a base for another object. The theory goes that if an object is used as a delta base for A, it will probably also be a delta base for B, C, D, E, etc. and therefore having an unpacked copy of it on hand will make delta resolution for the others very fast. However since objects are usually only accessed once, we don't want to cache everything we unpack, just things that we are likely to need again. The only things we need again are the delta bases. Hence, its a delta base cache. This gets us the class name UnpackedObjectCache back, so we can use it to actually create a cache of unpacked object information. Change-Id: I121f356cf4eca7b80126497264eac22bd5825a1d Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-08Support core.autocrlf = inputShawn O. Pearce9-11/+187
The core.autocrlf variable can take on three values: false, true, and input. Parsing it as a boolean is wrong, we instead need to parse a tri-state enumeration. Add support for parsing and setting enum values from Java from and to the text based configuration file, and use that to handle the autocrlf variable. Bug: 301775 Change-Id: I81b9e33087a33d2ef2eac89ba93b9e83b7ecc223 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-07Refactor diff sequence APIShawn O. Pearce26-688/+573
Instead of making the sequence itself responsible for the equivalence function, use an external function that is supplied by the caller. This cleans up the code because we now say cmp.equals(a, ai, b, bi) instead of a.equals(ai, b, bi). This refactoring also removes the odd concept of creating different types of sequences to have different behaviors for whitespace ignoring. Instead DiffComparator now supports singleton functions that apply a particular equivalence algorithm to a type of sequence. Change-Id: I559f494d81cdc6f06bfb4208f60780c0ae251df9 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-07Merge "Reduce compares in Edit.getType"Chris Aniszczyk1-7/+12
2010-09-06Fix checkReferencedIsReachable to use correct base listShawn O. Pearce3-14/+34
When checkReferencedIsReachable is set in ReceivePack we are trying to prove that the push client is permitted to access an object that it did not send to us, but that the received objects link to either via a link inside of an object (e.g. commit parent pointer or tree member) or by a delta base reference. To do this check we are making a list of every potential delta base, and then ensuring that every delta base used appears on this list. If a delta base does not appear on this list, we abort with an error, letting the client know we are missing a particular object. Preventing spurious errors about missing delta base objects requires us to use the exact same list of potential delta bases as the remote push client used. This means we must use TOPO ordering, and we need to enable BOUNDARY sorting so that ObjectWalk will correctly include any trees found during the enumeration back to the common merge base between the interesting and uninteresting heads. To ensure JGit's own push client matches this same potential delta base list, we need to undo 60aae90d4d15 ("Disable topological sorting in PackWriter") and switch back to using the conventional TOPO ordering for commits in a pack file. This ensures that our own push client will use the same potential base object list as checkReferencedIsReachable uses on the receiving side. Change-Id: I14d0a326deb62a43f987b375cfe519711031e172 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-06Discard object bodies when checking connectivityShawn O. Pearce1-0/+2
Since we are only checking the links between objects we don't need to hold onto commit messages after their headers have been parsed by the walker. Dropping them saves a bit of memory, which is always good when accepting huge pack files. Change-Id: I378920409b6acf04a35cdf24f81567b1ce030e36 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-06DeltaStream: Fix data corruption when reading large copiesShawn O. Pearce2-2/+21
If the copy instruction was larger than the input buffer given to us, we copied the wrong part of the base stream during the next read(). This occurred on really big binary files where a copy instruction of 64k wasn't unreasonable, but the caller's buffer was only 8192 bytes long. We copied the first 8192 bytes correctly, but then reseeked the base stream back to the start of the copy region on the second read of 8192 bytes. Instead of a sequence like ABCD being read into the caller, we read AAAA. Change-Id: I240a3f722a3eda1ce8ef5db93b380e3bceb1e201 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-06Use 8192 as default buffer size in ObjectLoader copyToShawn O. Pearce1-1/+1
As ObjectStreams are supposed to be buffered, most implementors will be wrapping their underlying stream inside of a BufferedInputStream in order to satisfy this requirement. Because developers are by nature lazy, they will use the default buffer size rather than specify their own. The OpenJDk JRE implementations use 8192 as the default buffer size, and when the higher level reader uses the same buffer size the buffers "stack" nicely by avoiding a copy to the internal buffer array. As OpenJDK is a popular virtual machine, we should try to benefit from this nice stacking property during copyTo(). Change-Id: I69d53f273b870b841ced2be2e9debdfd987d98f4 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-06Merge "Add helper methods to Edit"Chris Aniszczyk2-1/+65
2010-09-06Merge "log: Fix commit headers and -p flag"Shawn O. Pearce1-1/+1
2010-09-06Merge "Use 5 MiB for RevWalk default limit"Shawn O. Pearce2-27/+3
2010-09-04cleanup: Remove unnecessary @SuppressWarningsRobin Rosenberg2-2/+0
Change-Id: I1b239b587e1cc811bbd6e1513b07dc93a891a842 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
2010-09-04Reduce compares in Edit.getTypeShawn O. Pearce1-7/+12
We can slightly optimize this method by removing some compares based on knowledge of how the orderings have to work. This way a getType() invocation requires at most 2 int compares for any result, vs. the 6 required to find REPLACE before. Change-Id: I62a04cc513a6d28c300d1c1496a8608d5df4efa6 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-04Add helper methods to EditShawn O. Pearce2-1/+65
Exposing isEmpty, getLengthA, getLengthB make it easier to examine the state of an edit and work with it from higher level code. The before and after cut routines make it easy to split an edit that contains another edit, such as to decompose a REPLACE that contains a common sequence within it. Change-Id: Id63d6476a7a6b23acb7ab237d414a0a1a7200290 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-04log: Fix commit headers and -p flagShawn O. Pearce1-1/+1
We weren't flushing the commit message before the diff output, which meant the headers and message showed randomly interleaved with the diff rather than immediately before. Change-Id: I6cefab8d40e9d40c937e9deb12911188fec41b26 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-03Fix QuotedString.GIT_PATH escaping rulesShawn O. Pearce2-2/+17
We shouldn't escape non-special ASCII characters such as '@' or '~'. These are valid in a path name on POSIX systems, and may appear as part of a path in a GNU or Git style patch script. Escaping them into octal just obfuscates the user's intent, with no gain. When parsing an escaped octal sequence, we must parse no more than 3 digits. That is, "\1002" is actually "@2", not the Unicode character \u0202. Change-Id: I3a849a0d318e69b654f03fd559f5d7f99dd63e5c Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-03Remove costly quoting test in DiffFormatterShawn O. Pearce1-2/+1
QuotedString.GIT_PATH returns the input reference exactly if the string does not require quoting, otherwise it returns a copy that contains the quotes on either end, plus escapes in the middle where necessary to meet conventions. Testing the return against '"' + name + '"' is always false, because GIT_PATH will never return it that way. The only way we have quotes on either end is if there is an escape in the middle, in which case the string isn't equal anyway. Change-Id: I4d21d8e5c7da0d7df9792c01ce719548fa2df16b Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-03Merge branch 'unpack-error'Shawn O. Pearce5-5/+123
* unpack-error: ReceivePack: Rethrow exceptions caught during indexing Change-Id: I0d0239d69cb5cd1a622bdee879978f0299e0ca40
2010-09-03ReceivePack: Rethrow exceptions caught during indexingShawn O. Pearce5-5/+123
If we get an exception while indexing the incoming pack, its likely a stream corruption. We already report an error to the client, but we eat the stack trace, which makes debugging issues related to a bug inside of JGit nearly impossible. Rethrow it under a new type UnpackException, so embedding servers or applications can catch the error and provide it to a human who might be able to forward such traces onto a JGit developer for evaluation. Change-Id: Icad41148bbc0c76f284c7033a195a6b51911beab Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-02Use 5 MiB for RevWalk default limitShawn O. Pearce2-27/+3
Instead of getting the limit from CoreConfig, use the larger of the reader's limit or 5 MiB, under the assumption that any annotated tag or commit of interest should be under 5 MiB. But if a repository was really insane and had bigger objects, the reader implementation can set its streaming limit higher in order to allow RevWalk to still process it. Change-Id: If2c15235daa3e2d1f7167e781aa83fedb5af9a30 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-02Move ObjectDirectory streaming limit to WindowCacheConfigShawn O. Pearce7-30/+35
IDEs like Eclipse offer up the settings in WindowCacheConfig to the user as a global set of options that are configured for the entire JVM process, not per-repository, as the cache is shared across the entire JVM. The limit on how much we are willing to allocate for an object buffer is similar to the limit on how much we can use for data caches, allocating that much space impacts the entire JVM and not just a single repository, so it should be a global limit. Change-Id: I22eafb3e223bf8dea57ece82cd5df8bfe5badebc Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-02diff: Default arguments to HEAD, working directoryShawn O. Pearce2-4/+37
Similar to C Git, default our difference when no trees are given to us to something that makes a tiny bit of sense to the human. We also now support the --cached flag, and have its meaning work the same way as C Git. Change-Id: I2f19dad4e018404e280ea3e95ebd448a4b667f59 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-02Support creating the working directory differenceShawn O. Pearce5-41/+471
If the iterators passed into a diff formatter are working tree iterators, we should enable ignoring files that are ignored, as well as actually pull up the current content from the working tree rather than getting it from the repository. Because we abstract away the working directory access logic, we can now actually support rename detection between the working directory and the local repository when using a DiffFormatter. This means its possible for an application to show an unstaged delete-add pair as a rename if the add path is not ignored. (Because the ignored file wouldn't show up in our difference output.) Even more interesting is we can now do rename detection between any two working trees, if both input iterators are WorkingTreeIterators. Unfortunately we don't (yet) optimize for comparing the working tree with the index involved so we can take advantage of cached stat data to rule out non-dirty paths. Change-Id: I4c0598afe48d8f99257266bf447a0ecd23ca7f5e Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-02Fix TreeWalk bug comparing DirCache and WorkingTree with ANY_DIFFShawn O. Pearce6-6/+32
When comparing a DirCache and a WorkingTree using ANY_DIFF we sometimes didn't recursive into a subtree of both sides gave us zeroId() back for the identity of a subtree. This happens when the DirCache doesn't have a valid cache tree for the subtree, as then it uses zeroId() for the ObjectId of the subtree, which then appears to be equal to the zeroId() of the WorkingTreeIterator's subtree. We work around this by adding a hasId() method that returns true only if this iterator has a valid ObjectId. The idEquals method on TreeWalk than only performs a compare between two iterators if both iterators have a valid id. Change-Id: I695f7fafbeb452e8c0703a05c02921fae0822d3f Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-02log, diff: Add --src-prefix, --dst-prefix, --no-prefixShawn O. Pearce3-0/+35
Change-Id: I0c7154a51143d56362f12ee4fa93133778d3a9eb Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-02Move rename detection, path following into DiffFormatterShawn O. Pearce7-149/+441
Applications just want a quick way to configure our diff implementation, and then just want to use it without a lot of fuss. Move all of the rename detection logic and path following logic out of our pgm package and into DiffFormatter itself, making it much easier for a GUI to take advantage of the features without duplicating a lot of code. Change-Id: I4b54e987bb6dc804fb270cbc495fe4cae26c7b0e Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-02Merge "Fix RepositoryState.MERGING"Chris Aniszczyk1-2/+2
2010-09-02Fix RepositoryState.MERGINGJens Baumgart1-2/+2
canResetHead now returns true. Resetting mixed / hard works in EGit in merging state. Change-Id: I1512145bbd831bb9734528ce8b71b1701e3e6aa9 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2010-09-02Merge "Add reset() to AbstractTreeIterator API"Chris Aniszczyk5-0/+45
2010-09-02Merge "Improve DiffFormatter text file access"Chris Aniszczyk1-38/+75
2010-09-02Merge "Correct diff header formatting"Chris Aniszczyk2-84/+235
2010-09-02Merge "Remove duplicated code in DiffFormatter"Chris Aniszczyk1-33/+23
2010-09-02Merge "Adding sorting to LongList"Christian Halstrick1-0/+7
2010-09-02Merge "Use int[] rather than IntList for RawText hashes"Christian Halstrick5-11/+9
2010-09-02Adding sorting to LongListShawn O. Pearce1-0/+7
Sorting the array can be useful when its being used as a map of pairs that are appended into the array and then later merge-joined against another array of similar semantics. Change-Id: I2e346ef5c99ed1347ec0345b44cda0bc29d03e90 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-02Merge "Add toString and improve Javadoc of NotIgnoredFilter"Chris Aniszczyk1-13/+11
2010-09-01Use int[] rather than IntList for RawText hashesShawn O. Pearce5-11/+9
We know exactly how many lines we need by the time we compute our per-line hashes, as we have already built the lines IntList to give us the starting position of each line in the buffer. Using that we can properly size the array, and don't need the dynamic growing feature of IntList. So drop the indirection and just use a fixed size array. Change-Id: I5c8c592514692a8abff51e5928aedcf71e100365 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-01Refactor Git API exceptions to a new packageChris Aniszczyk23-32/+122
Create a new 'org.eclipse.jgit.api.errors' package to contain exceptions related to using the Git porcelain API. Change-Id: Iac1781bd74fbd520dffac9d347616c3334994470 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-09-01Add toString and improve Javadoc of NotIgnoredFilterShawn O. Pearce1-13/+11
Today while debugging some TreeWalk related code I noticed this filter did not have a toString(), making it harder to see what the filter graph was at a glance in the debugger. Add a toString() for debugging to match other TreeFilters, and clean up the Javadoc slightly so its a bit more clear about the purpose of the filter. While we are mucking about with some of this code, simplify the logic of include so its shorter and thus faster to read. The pattern now more closely matches that of SkipWorkTreeFilter. Change-Id: Iad433a1fa6b395dc1acb455aca268b9ce2f1d41b Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-01IndexDiff honors Index entries' "skipWorkTree" flag.Marc Strapetz2-2/+100
Change-Id: I428d11412130b64fc46d7052011f5dff3d653802 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-09-01Merge "Avoid double quotes in Git Config"Shawn Pearce2-4/+34
2010-09-01Merge "Add FS.detect() for detection of file system abstraction."Shawn Pearce1-6/+34
2010-09-01Add reset() to AbstractTreeIterator APIShawn O. Pearce5-0/+45
This allows callers to force the iterator back to its starting point, so it can be traversed again. The default way to do this is to use back(1) until first() is true, but this isn't very efficient for any iterator. All current implementations have better ways to implement reset without needing to seek backwards. Change-Id: Ia26e6c852fdac8a0e9c80ac72c8cca9d897463f4 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Back to the top