summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Refactor Git API exceptions to a new packageChris Aniszczyk2010-09-0123-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>
* IndexDiff honors Index entries' "skipWorkTree" flag.Marc Strapetz2010-09-012-2/+100
| | | | | Change-Id: I428d11412130b64fc46d7052011f5dff3d653802 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Merge "Avoid double quotes in Git Config"Shawn Pearce2010-09-012-4/+34
|\
| * Avoid double quotes in Git ConfigMathias Kinzler2010-09-012-4/+34
| | | | | | | | | | | | | | | | | | | | | | Currently, if a branch is created that has special chars ('#' in the bug), Config will surround the subsection name with double quotes during it's toText method which will result in an invalid file after saving the Config. Bug: 318249 Change-Id: I0a642f52def42d936869e4aaaeb6999567901001 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
* | Merge "Add FS.detect() for detection of file system abstraction."Shawn Pearce2010-09-011-6/+34
|\ \
| * | Add FS.detect() for detection of file system abstraction.Marc Strapetz2010-09-011-6/+34
| |/ | | | | | | | | | | To give the user more control on which file system abstraction should be used on Windows, FS.detect() may be configured to assume a Cygwin installation or nor.
* | Move DiffFormatter default initialization to fieldsShawn O. Pearce2010-09-011-4/+2
| | | | | | | | | | | | | | | | Other fields in this class are initialized in their declaration, make the code consistent with itself and use only one style. Change-Id: I49a007e97ba52faa6b89f7e4b1eec85dccac0fa4 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Correct Javadoc of DiffFormatter classShawn O. Pearce2010-09-011-1/+1
| | | | | | | | | | | | | | | | This class does a lot more than just reflow a patch script, it now is the primary means of creating a diff output. Change-Id: I74467c9a53dc270ef8c84e7c75f388414ec8ba8f Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | diff: Fix bad metaVar reference in --abbrev optionShawn O. Pearce2010-09-011-1/+1
|/ | | | | Change-Id: If92545b731ff80bff071aee9bbd852bbd187c7c5 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Extend DirCache test case to check "intent to add" flag.Marc Strapetz2010-08-312-2/+5
|
* Partial support for index file format "3".Marc Strapetz2010-08-316-15/+115
| | | | | | | | Extended flags are processed and available via DirCacheEntry's new isSkipWorkTree() and isIntentToAdd() methods. "resolve-undo" information is completely ignored since its an optional extension. Change-Id: Ie6e9c6784c9f265ca3c013c6dc0e6bd29d3b7233
* Merge "DirCacheEntry: UPDATE_NEEDED should be in-core flag."Shawn Pearce2010-08-311-4/+8
|\
| * DirCacheEntry: UPDATE_NEEDED should be in-core flag.Marc Strapetz2010-08-311-4/+8
| | | | | | | | | | | | In correspondance to CGit, UPDATE_NEEDED flag should not be written to disk. Furthermore, it currently intersects CGit's CE_EXTENDED flag.
* | Add test for RawParseUtils.formatBase10Shawn O. Pearce2010-08-311-0/+70
| | | | | | | | | | Change-Id: I3ad3533d03990c9e84186e53b9d755784b2a3758 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Fix RawParseUtils.formatBase10 to work with negative valuesMarc Strapetz2010-08-311-0/+2
| | | | | | | | | | Change-Id: Iffa220de76c5e180796fa46c4d67f52a1b3b2e35 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Remove deprecated PersonIdent constructorChris Aniszczyk2010-08-311-24/+0
| | | | | | | | | | Change-Id: I3831de1b6df25a52df30d367f0216573e6ee6b53 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | Improve MergeAlgorithm to produce smaller conflictsChristian Halstrick2010-08-312-6/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The merge algorithm was reporting conflicts which where to big. Example: The common base was "ABC", the "ours" version contained "AB1C" (the addition of "1" after pos 2) and the "theirs" version also contained "AB1C". We have two potentially conflicting edits in the same region which happen to bring in exactly the same content. This should not be a conflict - but was previously reported as "AB<<<1===1>>>C". This is fixed by checking every conflicting chunk whether the conflicting regions have a common prefix or suffix and by removing this regions from the conflict. Change-Id: I4dc169b8ef7a66ec6b307e9a956feef906c9e15e Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
* | Fix build of JGit source bundle and featureMatthias Sohn2010-08-312-1/+41
| | | | | | | | | | | | | | | | | | | | Add local changes I missed to push with [1] which broke the JGit build. [1] http://egit.eclipse.org/r/#change,1442 Change-Id: I300bfa84c5d8b5128026869b694ef5da7b0d3a4a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Let Resolve be the default Merge strategyChristian Halstrick2010-08-311-1/+1
| | | | | | | | | | | | | | the merge command should use by default the "resolve" merge strategy. Change-Id: I6c6973a3397cca12bd8a6bd950d04b1766a08b4c Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
* | Added merge strategy RESOLVEChristian Halstrick2010-08-317-104/+1064
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the first merge strategy to JGit which does real content-merges if necessary. The new merge strategy "resolve" takes as input three commits: a common base, ours and theirs. It will simply takeover changes on files which are only touched in ours or theirs. For files touched in ours and theirs it will try to merge the two contents knowing taking into account the specified common base. Rename detection has not been introduced for now. Change-Id: I49a5ebcdcf4f540f606092c0f1dc66c965dc66ba Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Stefan Lay <stefan.lay@sap.com>
* | Merge "Add one more test to ReadTreeTest"Chris Aniszczyk2010-08-301-0/+14
|\ \
| * | Add one more test to ReadTreeTestChristian Halstrick2010-08-301-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add an explicit test case to check that we don't overwrite dirty files in case Head & Index are equal. Change-Id: I6266d0a449e55369d2d0a048694dca5565c5fcf3 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
* | | Wait for JIT optimization before measuring diff performanceMatthias Sohn2010-08-301-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac OS X MyerDiffPerformanceTest was failing since during the first few tests the JIT compiler is running in parallel slowing down the tests. When setting the JVM option -Xbatch forcing the JIT to do its work prior to running the code this effect can be avoided. Instead we chose to run some tests without recording prior to the recorded tests since relying on -X JVM parameters isn't portable across JVMs. Use 10k * powers of 2 as sample size instead of odd numbers used before and also improve formatting of performance readings. Bug: 323766 Change-Id: I9a46d73f81a785f399d3cf5a90c8c0516526e048 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | | Generate source plugin and source feature for jgitMatthias Sohn2010-08-3011-0/+518
| | | | | | | | | | | | | | | | | | Change-Id: Ibc5a302078bfc01d9ee45a4c0ab0b79b2abd185a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | | Improve LargeObjectException reportingShawn O. Pearce2010-08-3010-18/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use 3 different types of LargeObjectException for the 3 major ways that we can fail to load an object. For each of these use a unique string translation which describes the root cause better than just the ObjectId.name() does. Change-Id: I810c98d5691b74af9fc6cbd46fc9879e35a7bdca Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | IndexPack: Use byte limited form of getCachedBytesShawn O. Pearce2010-08-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently our algorithm requires that we have the delta base as a contiguous byte array... but getCachedBytes() might not work if the object is considered to be large by its underlying loader. Use the limited form to obtain the object as a byte array instead. Change-Id: I33f12a8811cb6a4a67396174733f209db8119b42 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | Undo translation of protocol string 'unpack error'Shawn O. Pearce2010-08-303-3/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | This string is part of the network protocol, and isn't meant to be translated into another language. Clients actually scan for the string "unpack error " off the wire and react magically to this information. If it were translated, they would instead have a protocol exception, which isn't very useful when there is already an error occurring. Change-Id: Ia5dc8d36ba65ad2552f683bb637e80b77a7d92f0 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Merge "Buffer very large delta streams to reduce explosion of CPU work"Shawn O. Pearce2010-08-284-4/+273
|\ \
| * | Buffer very large delta streams to reduce explosion of CPU workShawn O. Pearce2010-08-274-4/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Large delta streams are unpacked incrementally, but because a delta can seek to a random position in the base to perform a copy we may need to inflate the base repeatedly just to complete one delta. So work around it by copying the base to a temporary file, and then we can read from that temporary file using random seeks instead. Its far more efficient because we now only need to inflate the base once. This is still really ugly because we have to dump to a temporary file, but at least the code can successfully process a large file without throwing OutOfMemoryError. If speed is an issue, the user will need to increase the JVM heap and ensure core.streamFileThreshold is set to a higher value, so we don't use this code path as often. Unfortunately we lose the "optimization" of skipping over portions of a delta base that we don't actually need in the final result. This is going to cause us to inflate and write to disk useless regions that were deleted and do not appear in the final result. We could later improve on our code by trying to flatten delta instruction streams before we touch the bottom base object, and then only store the portions of the base we really need for the final result and that appear out-of-order. Since that is some pretty complex code I'm punting on it for now and just doing this simple whole-object buffering. Because the process umask might be permitting other users to read files we create, we put the temporary buffers into $GIT_DIR/objects. We can reasonably assume that if a reader can read our temporary buffer file in that directory, they can also read the base pack file we are pulling it from and therefore its not a security breach to expose the inflated content in a file. This requires a reader to have write access to the repository, but only if the file is really big. I'd rather err on the side of caution here and refuse to read a very big file into /tmp than to possibly expose a secured content because the Java 5 JVM won't let us create a protected temporary file that only the current user can access. Change-Id: I66fb80b08cbcaf0f65f2db0462c546a495a160dd Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | Revert "Hide Maven target directories from Eclipse"Robin Rosenberg2010-08-2811-121/+0
|/ / | | | | | | | | | | | | | | | | This reverts commit db4c516f673e4c274e55adc27a95891c52a5aba8 since it breaks compatibility with Eclipse 3.5 which can no longer import the projects Bug: 323390 Change-Id: I3cc91364a6747cfcb4c611a9be5258f81562f726
* | Add TagCommandChris Aniszczyk2010-08-276-0/+498
| | | | | | | | | | | | | | | | | | A tag command is added to the Git porcelain API. Tests were also added to stress test the tag command. Change-Id: Iab282a918eb51b0e9c55f628a3396ff01c9eb9eb Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Implement a Dircache checkout (needed for merge)Christian Halstrick2010-08-276-22/+1074
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Implementation of a checkout (or 'git read-tree') operation which works together with DirCache. This implementation does similar things as WorkDirCheckout which main problem is that it works with deprecated GitIndex. Since GitIndex doesn't support multiple stages of a file which is required in merge situations this new implementation is required to enable merge support. Change-Id: I13f0f23ad60d98e5168118a7e7e7308e066ecf9c Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | Add getBaseCommit() to MergerChristian Halstrick2010-08-261-3/+22
| | | | | | | | | | | | | | | | | | | | | | The Merger was was only exposing the merge base as an AbstractTreeIterator. Since we need the merge base as RevCommit to generate the merge result I expose it here. Change-Id: Ibe846370a35ac9bdb0c97ce2e36b2287577fbcad Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Increase heap size for jgit testsMatthias Sohn2010-08-272-1/+2
| | | | | | | | | | | | | | | | Otherwise PackFileTest.testDelta_LargeObjectChain() reproducibly fails with OutOfMemoryError on Mac OS X 10.6.4. Change-Id: I6a55ff9ba181102606a0d99ffd52392a1615a422 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Remove unused importMatthias Sohn2010-08-261-1/+0
| | | | | | | | Change-Id: I22f5751720576475e5e1e04110268f6f7fb376b1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge "Fix parsing of multiple authors in PersonIdent."Shawn Pearce2010-08-267-128/+158
|\ \
| * | Fix parsing of multiple authors in PersonIdent.Marc Strapetz2010-08-267-128/+158
| |/ | | | | | | | | | | | | | | | | PersonIdent should be parsable for an invalid commit which contains multiple authors, like "A <a@a.org>, B <b@b.org>". PersonIdent(String) constructor now delegates to RawParseUtils.parsePersonIdent(). Change-Id: Ie9798d36d9ecfcc0094ca795f5a44b003136eaf7
* | Merge "Use JUnit4 for tests"Shawn Pearce2010-08-266-37/+37
|\ \
| * | Use JUnit4 for testsChris Aniszczyk2010-08-266-37/+37
| |/ | | | | | | | | | | | | We should use JUnit4 for tests. This patch updates the MANIFEST.MF and respective launch configurations. Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* / Run formatter on edited lines via save actionChris Aniszczyk2010-08-269-27/+36
|/ | | | | | | | Updates the project level settings to run the formatter on save on only on the edited lines. Change-Id: I26dd69d0c95e6d73f9fdf7031f3c1dbf3becbb79 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Increase temporary buffer for unit testShawn O. Pearce2010-08-251-1/+2
| | | | | | | | Because we are using the large stream size, we have to be above the STREAM_THRESHOLD constant, which I just increased. Change-Id: I6f10ec8558d9f751d4b547fcae05af94f1c8866b Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Increase the default streaming threshold to 15 MiBShawn O. Pearce2010-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | | Applying deltas in the large streaming mode is horrifically slow. Trying to pack icu4c is impossible because a single 11 MiB file sits on top of a 15 MiB file though a 10 deep delta chain, which results in this very slow inflate process. Upping the default limit to 15 MiB lets us process this large in a reasonable time, but its still sufficiently low enough to prevent exploding the heap of a very large process like Eclipse or Gerrit Code Review. We have to revisit the streaming delta application process and do something much smarter, like flatten the delta chain before we apply it to the base. But even that is ugly, I've seen a 155 MiB delta sitting on top of a 450 MiB file to produce a 300 MiB result object. If the chain is deep, we may have trouble flatting it down. Change-Id: If5a0dcbf9d14ea683d75546f104b09bb8cd8fdbb Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Fix reuse from pack file for REF_DELTA typesShawn O. Pearce2010-08-251-1/+1
| | | | | | | | | | | | | We miscomputed the CRC32 checksum for a REF_DELTA type of object, by not including the full 20 byte ObjectId of the delta base in the CRC code we use when the delta is too large to go through our two faster small reuse code paths. This resulted in a corruption error during packing, where the PackFile erroneously suspected the data was wrong on the local filesystem and aborted writing, because the CRC didn't match what we had read from the index. Change-Id: I7d12cdaeaf2c83ddc11223ce0108d9bd6886e025 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Cleanup and correct resolve JavadocShawn O. Pearce2010-08-251-10/+30
| | | | | | | | | We didn't fully cover what we support and what we don't. It was also a bit hard to follow the syntaxes supported. Clean that up by documenting it. Change-Id: I7b96fa6cbefcc2364a51f336712ad361ae42df2d Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Support parsing commit:path style blob referencesShawn O. Pearce2010-08-252-0/+50
| | | | | | | | | We can now resolve expressions that reference a path within a commit, designating a specific revision of a specific tree or file in the project. Change-Id: Ie6a8be629d264d72209db894bd680c5900035cc0 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Support parsing git describe style outputShawn O. Pearce2010-08-252-16/+64
| | | | | | | | | | We now match on the -gABBREV style output created by git describe when its describing a non-tagged commit, and resolve that back to the full ObjectId using the abbreviation resolution feature that we already support. Change-Id: Ib3033f9483d9e1c66c8bb721ff48d4485bcdaef1 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Rename T0008_testparserev to RepositoryResolveTestShawn O. Pearce2010-08-251-1/+1
| | | | | | | | Calling it by the old numerical numbering system makes it really hard to find the test that tests Repository.resolve(String). Change-Id: I92d0ecbc8d66ce21bfed08888eeedf1300ffa594 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Throw AmbiguousObjectException during resolve if its ambiguousShawn O. Pearce2010-08-252-3/+24
| | | | | | | | | | | Its wrong to return null if we are resolving an abbreviation and we have proven it matches more than one object. We know how to resolve it if we had more nybbles, as there are two or more objects with the same prefix. Declare that to the caller quite clearly by giving them an AmbiguousObjectException. Change-Id: I01bb48e587e6d001b93da8575c2c81af3eda5a32 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Complete an abbreviation when formatting a patchShawn O. Pearce2010-08-255-9/+144
| | | | | | | | | | If we are given a DiffEntry header that already has abbreviated ObjectIds on it, we may still be able to resolve those locally and output the difference. Try to do that through the new resolve API on ObjectReader. Change-Id: I0766aa5444b7b8fff73620290f8c9f54adc0be96 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Use limited getCachedBytes in RevWalkShawn O. Pearce2010-08-256-48/+78
| | | | | | | | | | | | | Parsing is rewritten to use the size limited form of getCachedBytes, thus freeing the revwalk infrastructure from needing to care about a large object vs. a small object when it gets an ObjectLoader. Right now we hardcode our upper bound for a commit or annotated tag to be 15 MiB. I don't know of any that is more than 1 MiB in the wild, so going 15x that should give us some reasonable headroom. Change-Id: If296c211d8b257d76e44908504e71dd9ba70ffa8 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 04:21:12 +0000