aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Merge "CheckoutCommand: Fix checking out ours/theirs when no base stage ↵Christian Halstrick2014-12-122-3/+42
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | exists" into stable-3.6
| | * | | | CheckoutCommand: Fix checking out ours/theirs when no base stage existsRobin Stocker2014-12-102-3/+42
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of an add/add conflict, no base stage exists. The previous implementation would skip over the entries because the condition expected the base stage to always exist. Change-Id: Ie2b3685d958c09b241991b74e6177401e8a1ebc9 Signed-off-by: Robin Stocker <robin@nibor.org>
| * / | | Make sure modifications to config-param trustFolderStat are detectedChristian Halstrick2014-12-051-11/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | ObjectDirectory.searchPacksAgain() should always read trustFolderStat from the config and not rely on a cached value. Change-Id: I90edbaae3c64eea0c9894d05acde4267991575ee
* | | | Merge "Implement FileSnapshot.toString() to help debugging"Shawn Pearce2014-12-191-1/+17
|\ \ \ \
| * | | | Implement FileSnapshot.toString() to help debuggingMatthias Sohn2014-12-061-1/+17
| |/ / / | | | | | | | | | | | | Change-Id: Ic18d051327e491d5834929ff7fa28381f0f972c4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Merge "Revert "Extract path info from requests without decoding""Shawn Pearce2014-12-125-96/+7
|\ \ \ \
| * | | | Revert "Extract path info from requests without decoding"Shawn Pearce2014-12-125-96/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 19f869996f27adf59ec507e5f565d8b5619576f3. Leaving path info encoded confuses applications like Gitiles. Trying to fix this inside of JGit was maybe the wrong solution. Change-Id: I8df9ab6233ff513e427701c8a1a66022c19784eb
* | | | | AWTPlotRenderer: use float arithmetic instead of double followed by a conversionJonathan Nieder2014-12-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiplying by 0.9 and converting back to float is slightly more complicated and achieves the same effect as multiplying by the float 0.9f directly. Change-Id: I555863bb1251badee8887b9b93c5463eda0a3509 Signed-off-by: Jonathan Nieder <jrn@google.com>
* | | | | Merge "Extract path info from requests without decoding"Shawn Pearce2014-12-105-7/+96
|\| | | |
| * | | | Extract path info from requests without decodingDavid Pletcher2014-12-095-7/+96
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitiles malfunctions in conjunction with jgit and guice because of a recent Guice bug fix. Work around the problem by parsing the URI directly, bypassing the unescaping performed by the getPathInfo method. This rest of this message is copied from https://gerrit-review.googlesource.com/#/c/60820/ : The fix for Guice issue #745[1] causes getPathInfo() within the GuiceFilter to return decoded values, eliminating the difference between "foo/bar" and "foo%2Fbar". This is in spec with the servlet standard, whose javadoc for getPathInfo[2] states that the return value be "decoded by the web container". Work around this by extracting the path part directly from the request URI, which is unmodified by the container. This is copying the Guice behavior prior to the bugfix. [1] https://github.com/google/guice/issues/745 [2] http://docs.oracle.com/javaee/7/api/javax/servlet/http/HttpServletRequest.html#getPathInfo() Change-Id: I7fdb291bda377dab6160599ee537962d5f60f1e8 Signed-off-by: David Pletcher <dpletcher@google.com>
* | | | Build with Tycho 0.22.Alexander Kurtakov2014-12-092-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I32444e926179827be31d9201a6bbc5d514672110 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
* | | | Do not use deprecated tasks in maven-antrun-plugin.Alexander Kurtakov2014-12-093-8/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | Maven-antrun-plugin deprecated tasks in favor of target, this patch fixes JGit poms to do the same. Change-Id: I420fd2ce88c61cf8e786ed45fbb8235dc30c124e Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
* | | Merge "Honor git-core meaning of receive.denyDeletes allowing tag deletion"Matthias Sohn2014-11-291-10/+36
|\ \ \
| * | | Honor git-core meaning of receive.denyDeletes allowing tag deletionShawn Pearce2014-11-291-10/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | receive.denyDeletes parameter refers only to branch: http://thread.gmane.org/gmane.comp.version-control.git/99746 Bug: 412640 Change-Id: Ief3fa6abc0c9a18ba0a671ff9854432cec480c4f
* | | | Move checkPath from DirCacheCheckout to ObjectCheckerShawn Pearce2014-11-284-24/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bulk of the "is this sane" logic is inside of ObjectChecker. The only caller for the version in DirCacheCheckout is an obtuse usage for the static isValidRefName() method in Repository. Deprecate the weird single use method in DirCacheCheckout and move all code for checking a sequence of path components into ObjectChecker, where it makes sense alongside the existing code that checks a single component at a time. Reuse a single ObjectChecker for the local platform, to avoid looking up the system properties on each path string considered. Change-Id: Iae6e769f2bfcad05c166e70ff255f9cf9fcdc87e
* | | | Use baseline instead of centerline in PlotRendererMichael Keppler2014-11-292-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the text extent height of a to be rendered plot line is odd, then the SWTPlotRenderer cannot calculate the correct Y position for drawing the label and draws the label with a 1 pixel offset. SWT text drawing uses the baseline as Y coordinate. Due to the given centerline API in the AbstractPlotRenderer the overall calculation of the baseline for SWT is effectively (height / 2) * 2, thereby rounding all odd heights downward to the next even number. This change pushes the division by 2 from the caller into the implementations of drawText. A corresponding change will be pushed in the egit repository. Bug: 450813 Change-Id: I66f4e71873bb8e6f936fde573bbe4c35fe23a022 Signed-off-by: Michael Keppler <michael.keppler@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Consider parent rules if ignore rule is negatedAndrey Loskutov2014-11-293-10/+294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change tries to make jgit behave more like native CLI git regarding the negation rules. According to [1] "... prefix "!" which negates the pattern; any matching file excluded by a previous pattern will become included again." Negating the pattern should not automatically make the file *not ignored* - other pattern rules have to be considered too. The fix adds test cases for both bugs 448094 and 407475. [1] https://www.kernel.org/pub/software/scm/git/docs/gitignore.html Bug: 448094 Bug: 407475 Change-Id: I322954200dd3c683e3d8f4adc48506eb99e56ae1 Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | ResolveMerger: Use checkoutEntry during abortShawn Pearce2014-11-271-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cleanUp path is trying to restore files that previously were clean, but were overwritten in the work tree by a partial merge attempt that has failed and needs to be aborted. Reuse the checkout logic to write the file content and refresh the stat data. Change-Id: I320d33b3744daf88d3155db99e957408937ddd00
* | | | Cleanup double stat update of symlinks in DirCacheCheckoutShawn Pearce2014-11-271-33/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When writing a symlink the stat data should only be written once into the DirCacheEntry, based on the symlink itself and not the possibly resolved destination observed by java.io.File. Refactor the code to handle symlinks and early return. This removes the risk the blob stat info update is used against a newly checked out symlink. Hoist the file length stat update immediately after writing the file, before a rename. This eliminates any race caused by another process updating the file length after the rename and having it to fall into the racily clean path. Change-Id: I978ad9719c018ce1cf26947efbabaa8b9dff2217
* | | | Deprecate checkoutEntry variant that accepts FileShawn Pearce2014-11-275-49/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Entries should only be written to the working tree managed by the Repository. Simplify callers by passing only the entry and computing the work tree location inside of the checkoutEntry method. Change-Id: I574e41280d0407f1853fda12f4bd0d30f75d74e7
* | | | DirCacheCheckout: create only one ObjectReaderShawn Pearce2014-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This deprecated method accidentally creates two ObjectReader instances. Use the instance created one line above that is correctly released in the finally block. Change-Id: Ic57d041674611802a9384d8fa1d292e821055019
* | | | Support DfsRepository from GarbageCollectCommandShawn Pearce2014-11-251-15/+32
|/ / / | | | | | | | | | Bug: 406379 Change-Id: I7f4f23cd50d46ffcde69d6abfe3ca0cc6fa86604
* | | Allow configurable ObjectCheckers in fetchShawn Pearce2014-11-245-11/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RecievePack already honors fsck settings for safeForWindows and safeForMacOS. Allow those same checks to be performed during fetch through a caller-configurable ObjectChecker. Default the fetch fsck options to match the current platform, as it can be reasonably assumed the repository will be accessed here. Change-Id: I3c0f411fad209c6bd8fb9c4acf5c55a6799a6a2a
* | | Merge changes If5b8bb91,Ib57fba6cMatthias Sohn2014-11-243-6/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: Cleanup TreeWalk creation/release inside StashApplyCommand Deprecate checkoutEntry without ObjectReader
| * | | Cleanup TreeWalk creation/release inside StashApplyCommandShawn Pearce2014-11-241-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TreeWalk constructor doesn't throw in a meaninful way that requires cleanup of the not-yet-created TreeWalk. Hoist the constructor outside of the try/finally and remove the now unnecessary != null check during the finally. Change-Id: If5b8bb91562715df0699726648123a47426b9850
| * | | Deprecate checkoutEntry without ObjectReaderShawn Pearce2014-11-242-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Callers should manage the ObjectReader, as this allows the JGit library to cache context relevant information across files checked out at the same time. If the caller only has one file to checkout, it should still explicitly manage the life span of the ObjectReader. Change-Id: Ib57fba6cb4b774ccff8c416ef4d32e2b390f16a9
* | | | Delete .eclipse_iplogMatthias Sohn2014-11-241-122/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | We don't use this file anymore since a long time since IP log generation has been automated at the Eclipse foundation. Change-Id: I36dd5291d53d06af6a3378c0229c1908e153caae Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Set permission bits for "executable" attribute according to the umaskAndrey Loskutov2014-11-223-3/+257
| | | | | | | | | | | | | | | | | | Bug: 424395 Change-Id: I3f5c55dd4c084529af2319029305ba2e174e0636 Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | upload-pack: send symbolic refs as capabilitiesYuxuan 'fishy' Wang2014-11-213-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | cgit has this feature for some time. This will teach JGit to send symbolic refs, too. Change-Id: I7cb2ab4e6d31a838a0af92eac64535fdb66ed74a Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>
* | | Define version of javadoc plugin used to generate siteMatthias Sohn2014-11-181-1/+3
| | | | | | | | | | | | | | | | | | | | | This silences the Maven warning "'reporting.plugins.plugin.version' for org.apache.maven.plugins:maven-javadoc-plugin is missing" Change-Id: I036210fefb6bd81ca04fcd91aaba0f9d0c1e8862 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Include the java7 feature in org.eclipse.jgit.featureMatthias Sohn2014-11-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | This way we no longer need to advertise it in the release train and can uncategorize the jgit features without making it harder for users to find and install the java7 feature. Bug: 451276 Change-Id: I4c7dd0e1609fc1939d8ea83c01251dec59c228a3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Don't use java.util.regex for two simple wildcard casesAndrey Loskutov2014-11-187-27/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To improve ignore parser performance we can avoid using java.util.regex code on simple wildcard patterns with leading or trailing asterisk. As those patterns represent a majority of ignore rules, the index diff performance can be drastically increased on huge repository with lot of ignore rules. Bug: 450466 Change-Id: I80428441cc8d5de5468813f841d89322413eed8b Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Merge "Fix variable name and error message for sideband testing"Shawn Pearce2014-11-134-7/+7
|\ \ \
| * | | Fix variable name and error message for sideband testingStefan Beller2014-11-104-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually the test only allows a range from [1,255], so let's name the variable so. Change-Id: Iecdb8149b83389c67e3cd2f64f4a654c175475be Signed-off-by: Stefan Beller <sbeller@google.com>
* | | | Let RepositoryBuilder find bare reposChristian Halstrick2014-11-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BaseRepositoryBuilder.findGitDir() was not searching correctly for bare repositories. E.g. when running org.eclipse.jgit.pgm.Log and the current directory was that of a bare git repository an error "fatal: error: can't find git directory" was raised. With this fix RepositoryBuilder will also check whether the given directory is the root of a bare repository. Bug: 450193 Change-Id: I4d4ad42e24ca397745adb0f3385caee3bcf3a186 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Prepare post 3.6.0-m1 buildsMatthias Sohn2014-11-1255-59/+59
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie9927de64fa6b7d517f96b8cd12e57541f284ff2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | JGit v3.6.0.201411121045-m1v3.6.0.201411121045-m1Matthias Sohn2014-11-1255-59/+59
| | | | | | | | | | | | | | | | | | | | Change-Id: I9d789113d88cbbbdbabb8919f80c805aa4ba86fe Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Merge branch 'stable-3.5'Matthias Sohn2014-11-121-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.5: Prepare 3.5.3-SNAPSHOT builds JGit v3.5.2.201411120430-r Don't use SSL anymore to avoid POODLE attack Change-Id: Icc8404a94512aae36da83baafb8b10422b7bbf7b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | Prepare 3.5.3-SNAPSHOT buildsMatthias Sohn2014-11-1255-264/+264
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia37eb66a0deaf6e86a726b1b12eaea25416d4a36 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | JGit v3.5.2.201411120430-rv3.5.2.201411120430-rMatthias Sohn2014-11-1255-59/+59
| | | | | | | | | | | | | | | | | | | | Change-Id: I217d25ee712cbde52bc9319ef1dd15d2f571d37a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | Don't use SSL anymore to avoid POODLE attackDani Megert2014-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For details about poodle see: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-3566 Bug 450170 Change-Id: Ib169e88d9d51f4d0e6caa3a498f48edc81e0991d Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Introduce config parameter core.trustfolderstatChristian Halstrick2014-11-122-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JGit's ObjectDirectory implements the optimization that it remembers the pack folders (.git/objects/pack) lastModified timestamp and doesn't check for new packfiles in this folder if the lastModified attribute has not changed. In environments using NFS this can cause trouble. If multiple JGit instances from multiple machines work on the same repository and one instance creates a new ref and a new packfile (e.g. by doing a fetch) then the other machines may detect the new ref but can't resolve the referenced object because it doesn't detect that pack folder has a new packfile. That's because NFS may cache file/folder metadata for quite a long time and the pack folders modification time is not updated although a new packfile is there and could be read. The new config parameter core.trustfolderstat controls this behaviour. The default is true and jgits behaviours is unchanged. But if this parameter is set to false then jgit doesn't trust the pack directories lastmodified anymore. Instead it will always iterate through the content of that folder to detect new packfiles. Change-Id: Ie3b4e92933286aa9916070a22422e629b3147f54 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Fix javadoc formatting in ConfigConstantsMatthias Sohn2014-11-121-23/+15
| |/ / |/| | | | | | | | Change-Id: I6ae39b874a3c1fa9e1cda235ff137c9eb8dd359f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Expand wildcard imports to specfic classesShawn Pearce2014-11-1010-42/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | JGit style is to import exactly the classes required, and never to use "import foo.*" as the foo package could add new classes in the future which are conflicting/confusing with the imports already used by a source file. Change-Id: I5693408c777e5843ec65fff1163d5d717849fa34
* | | Fix possible NPE in IndexDiff when not all submodules are clonedChristian Halstrick2014-11-092-21/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | The latest changes to IndexDiff just assumed that all configured submodules are allways cloned. If a configured submodule did not exist an exception was thrown. This is fixed by this commit. Bug: 450567 Change-Id: Iabe3b196d998c19483082e5720038ebddaeb1890
* | | Add missing @since tagsChristian Halstrick2014-11-092-2/+9
| | | | | | | | | | | | Change-Id: Ia657e46b9abc8c8640f63f6ff579b2f8f2b01de4
* | | 4.4 target platform should use Luna repositoryMatthias Sohn2014-11-091-1/+1
| | | | | | | | | | | | Change-Id: I54cdfb5699f87bf86b0434aff0b9618e57a80757 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Merge "Add target platform for Mars using Orbit S-build"Matthias Sohn2014-11-092-1/+82
|\ \ \
| * | | Add target platform for Mars using Orbit S-buildMatthias Sohn2014-11-072-1/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updates: - jsch to 0.1.51 (CQ 8889) - ant to 1.9.4 (CQ 8890) CQ: 8889 CQ: 8890 Change-Id: I31f331ce797994d164661b421bfbab33c289deaf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Merge "Implement atomic refs update, if possible by database"Shawn Pearce2014-11-076-0/+45
|\ \ \ \ | |/ / / |/| | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-15 06:17:15 +0000