aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* SimpleMergeTest: Clean up code styleDemetr Starshov2020-06-101-156/+149
| | | | | Signed-off-by: Demetr Starshov <dstarshov@google.com> Change-Id: Ib0149279324a8b085eec4c60d02c8f32a8cc86bb
* Merge branch 'stable-5.8'Matthias Sohn2020-06-090-0/+0
|\ | | | | | | | | | | | | | | | | * stable-5.8: Prepare 5.8.1-SNAPSHOT builds Handle Fragment-Host declaration when updating version JGit v5.8.0.202006091008-r Change-Id: I956947c8bbceb09f9cf9bfc58fff2ed6a15aba99 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare 5.8.1-SNAPSHOT buildsMatthias Sohn2020-06-0988-503/+503
| | | | | | | | | | Change-Id: Ic654fb45abe4e94f4eee532af0f4278d372d37f5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Handle Fragment-Host declaration when updating versionMatthias Sohn2020-06-091-0/+1
| | | | | | | | | | | | Change-Id: If7ad9c4b26025e4358e3b4228dda43fdf93d2978 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> (cherry picked from commit a51b440840aa5f2cd20ae4c2edf6cdade18179df)
| * JGit v5.8.0.202006091008-rv5.8.0.202006091008-rMatthias Sohn2020-06-0988-121/+121
| | | | | | | | | | Change-Id: I2020e9821c359b90b7c830031945e2fc659ea607 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Merge branch 'master' into stable-5.8Matthias Sohn2020-06-08297-1075/+9326
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Add benchmark for strategies how to move a file Add getter for unpackErrorHandler in ReceivePack Upgrade maven-project-info-reports-plugin to 3.1.0 Upgrade maven-shade-plugin to 3.2.4 ObjectDirectoryInserter: Open FileOutputStream in try-with-resource ObjectDirectoryInserter: Remove redundant 'throws' declarations ObjectDirectory: Further clean up insertUnpackedObject Add Git#shutdown for releasing resources held by JGit process ApplyCommand: use context lines to determine hunk location GPG: don't prompt for a passphrase for unprotected keys Fix typo in org.eclipse.jgit.ssh.jsch.test MANIFEST Fix ProtectedMembersInFinalClass warning flagged by error prone Use version range to define fragment host bundle version ObjectDirectory: Explicitly handle NoSuchFileException ObjectDirectory: Fail immediately when atomic move is not supported Fix jgit packaging Fix InvalidInlineTag error flagged by error prone Fix BadComparable error flagged by error prone Add tests for RawTextComparator.WS_IGNORE_CHANGE.hash() Update Orbit to R20200529191137 for final Eclipse release 2020-06 Organize manifest of org.eclipse.jgit.pgm Do not include log4j implementation in jgit Decouple JSch from JGit Core Decouple BouncyCastle from JGit Core Verify that the user home directory is valid WindowCache: conditional JMX setup RawTextComparator.WS_IGNORE_CHANGE must not compare whitespace Revert "PackBitmapIndex: Not buffer inflated bitmap in BasePackBitmapIndex" Update jetty to 9.4.28.v20200408 Add 4.16 staging target platform In-memory SSH keys for the "no files" sshd tests Builder API to configure SshdSessionFactories TransportHttp: abort on time-out or on SocketException Ignore core.eol if core.autocrlf=input Attributes: fix handling of text=auto in combination with eol Bazel: Remove superfluous dependencies flagged by unused_deps Log stack trace if CachingKeyPairProvider hits unexpected exception Update Orbit to S20200519202422 and ant to 1.10.8 Include full IssuerFingerprint in GPG signature Bazel: Fix src_sha1 of bcpg-jdk15on Suppress API error for new method BitmapIndex.Bitmap#retrieveCompressed Fix wrong @since tags added in dcb0265 PackBitmapIndex: Set distance threshold PackBitmapIndex: Not buffer inflated bitmap in BasePackBitmapIndex PackBitmapIndex: Remove convertedBitmaps in the Remapper PackBitmapIndex: Reduce memory usage in GC PackBitmapIndex: Add AddToBitmapWithCacheFilter class PackBitmapIndex: Add util methods and builder to BitmapCommit PackBitmapIndex: Move BitmapCommit to a top-level class Refactor: Make retriveCompressed an method of the Bitmap class Fix downloading LFS Object fails behind proxy Allow for using custom s3 host with lfs server ReceivePack: adding IterativeConnectivityChecker Moving transport/internal -> internal/transport Fix error occurring during checkout Change-Id: I675cfb9eee956bab4903f28d8021115afc753dcd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Prepare 5.9.0-SNAPSHOT buildsMatthias Sohn2020-06-0988-503/+503
| | | | | | | | | | | | | | | Change-Id: Ia998e2772df1285a4c674b07201f15d53156eb78 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Handle Fragment-Host declaration when updating versionMatthias Sohn2020-06-091-0/+1
| |/ |/| | | | | | | Change-Id: Ic1b17245f221496818a975bc4f07b74878d257a5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Add benchmark for strategies how to move a fileMatthias Sohn2020-06-061-0/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can either - try moving the file and, in case the target directory doesn't exist, handle the NoSuchFileException this raises to create the target directory - or we always first test if the target directory exists and create it in case it is missing On my Mac this yields Benchmark Mode Cnt Score Error Units FileMoveBenchmark.moveFileToExistingDir avgt 5 196.490 ± 15.194 us/op FileMoveBenchmark.moveFileToExistingDirExists avgt 5 223.217 ± 54.816 us/op FileMoveBenchmark.moveFileToMissingDir avgt 5 332.169 ± 43.871 us/op FileMoveBenchmark.moveFileToMissingDirExists avgt 5 303.815 ± 137.568 us/op This means if the target directory of the move already exists the first strategy is faster by around 25 us/op otherwise the second one is faster by around 30 us/op. Which one is favorable depends on the average probability that the target directory exists in real world scenarios. Change-Id: I03653b408b859a796508dfa1471b36c65633534e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge "Merge branch 'stable-5.7'"Matthias Sohn2020-06-052-54/+51
|\ \
| * \ Merge branch 'stable-5.7'David Pursehouse2020-06-052-54/+51
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.7: ObjectDirectoryInserter: Open FileOutputStream in try-with-resource ObjectDirectoryInserter: Remove redundant 'throws' declarations ObjectDirectory: Further clean up insertUnpackedObject ObjectDirectory: Explicitly handle NoSuchFileException ObjectDirectory: Fail immediately when atomic move is not supported Change-Id: I05186baa517388680fcc6825c940c4c772f26d32 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | * | ObjectDirectoryInserter: Open FileOutputStream in try-with-resourceDavid Pursehouse2020-06-051-16/+16
| | | | | | | | | | | | | | | | | | | | Change-Id: Icc569aeefdc79baee5dfb71fb34d881c561dcf52 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | * | ObjectDirectoryInserter: Remove redundant 'throws' declarationsDavid Pursehouse2020-06-051-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ObjectWritingException and FileNotFoundException are subclasses of IOException, which is already declared. Error does not need to be explicitly declared. Change-Id: I879820a33e10ec3a7ef676adc9c9148d2b3c4b27 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | * | ObjectDirectory: Further clean up insertUnpackedObjectDavid Pursehouse2020-06-051-17/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The code to move the file is repeated. Split it out into a utility method. - Remove the catch block for AtomicMoveNotSupportedException which is redundant because it's handled in exactly the same way as the IOException further down. The only exception we need to explicitly handle differently in this block is NoSuchFileException. - Improve the comments. Change-Id: Ifc5490953ffb25ecd1c48a06289eccb3f19910c6 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | * | ObjectDirectory: Explicitly handle NoSuchFileExceptionDavid Pursehouse2020-06-041-19/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the first attempt to move the temp file, NoSuchFileException can be raised if the destination folder does not exist. Instead of handling this implicitly in the catch of IOException and then continuing to create the destination folder and try again, explicitly catch it and create the destination folder. If any other IOException occurs, treat it as an unexpected error and return FAILURE. Subsequently, on the second attempt to move the temp file, if ANY kind of IOException occurs, also consider this an unexpected error and return FAILURE. In both catch blocks for IOException, add logging at ERROR level. Change-Id: I9de9ee3d2b368be36e02ee1c0daf8e844f7e46c8 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | * | ObjectDirectory: Fail immediately when atomic move is not supportedDavid Pursehouse2020-06-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If atomic move is not supported, AtomicMoveNotSupportedException will be thrown on the first attempt to move the temp file. There is no point attempting the move operation a second time because it will only fail for the same reason. Add an immediate return of FAILURE on the first occasion. Remove the unnecessary handling of the exception in the second block. Change-Id: I4658a8b37cfec2d7ef0217c8346e512968d0964c Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | | Add getter for unpackErrorHandler in ReceivePackJack Wickham2020-06-051-0/+10
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current mechanism for updating the unpack error handler requires that the error handler is replaced entirely, including communicating the error to the user. Adding a getter means that delegating implementations can be constructed so that the error can be processed before sending to the user, for example for logging. Change-Id: I4b6f78a041d0f6f5b4076a9a5781565ca3857817 Signed-off-by: Jack Wickham <jwickham@palantir.com>
* | | Upgrade maven-project-info-reports-plugin to 3.1.0David Pursehouse2020-06-051-1/+1
| | | | | | | | | | | | | | | Change-Id: I16e24bbec033ea707cb5c5a0ff3c21859e602f39 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | Upgrade maven-shade-plugin to 3.2.4David Pursehouse2020-06-051-1/+1
| | | | | | | | | | | | | | | Change-Id: Iba47e9304b6f20e8aa4855378bc86063919bb909 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | Add Git#shutdown for releasing resources held by JGit processMatthias Sohn2020-06-043-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The shutdown method releases - ThreadLocal held by NLS - GlobalBundleCache used by NLS - Executor held by WorkQueue Bug: 437855 Bug: 550529 Change-Id: Icfdccd63668ca90c730ee47a52a17dbd58695ada Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | ApplyCommand: use context lines to determine hunk locationThomas Wolf2020-06-0414-43/+659
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a hunk does not apply at the position stated in the hunk header try to determine its position using the old lines (context and deleted lines). This is still a far cry from a full git apply: it doesn't do binary patches, it doesn't handle git's whitespace options, and it's perhaps not the fastest on big patches. C git hashes the lines and uses these hashes to speed up matching hunks (and to do its whitespace magic). Bug: 562348 Change-Id: Id0796bba059d84e648769d5896f497fde0b787dd Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | GPG: don't prompt for a passphrase for unprotected keysThomas Wolf2020-06-043-23/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BouncyCastle supports reading GPG keys without passphrase since 1.62. Handle this in JGit, too, and don't prompt for a passphrase unless it's necessary. Make two passes over the private key files, a first pass without passphrase provider. If that succeeds it has managed to read a matching key without passphrase. Otherwise, ask the user for the passphrase and make a second pass over the key files. BouncyCastle 1.65 still has no method to get the GPG "key grip" from a given public key, so JGit still cannot determine the correct file to read up front. (The file name is the key grip as 40 hex digits, upper case, with extension ".key"). Bug: 548763 Change-Id: I448181276548c08716d913c7ba1b4bc64c62f952 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | Merge "Fix typo in org.eclipse.jgit.ssh.jsch.test MANIFEST"Matthias Sohn2020-06-041-1/+1
|\ \ \
| * | | Fix typo in org.eclipse.jgit.ssh.jsch.test MANIFESTThomas Wolf2020-06-041-1/+1
| | | | | | | | | | | | | | | | Change-Id: I1d1484b32aa0c6464b5c38f2a2987716589ae9aa Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | Fix ProtectedMembersInFinalClass warning flagged by error proneDavid Ostrovsky2020-06-041-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running recent error prone version complaining on that code: CharacterHead.java:22: error: [ProtectedMembersInFinalClass] Make members of final classes package-private: <init> protected CharacterHead(char expectedCharacter) { ^ (see https://errorprone.info/bugpattern/ProtectedMembersInFinalClass) Did you mean 'CharacterHead(char expectedCharacter) {' Bug: 562756 Change-Id: Ic46a0b07e46235592f6e63db631f583303420b73 Signed-off-by: David Ostrovsky <david@ostrovsky.org>
* | | Use version range to define fragment host bundle versionMatthias Sohn2020-06-042-2/+2
| | | | | | | | | | | | Change-Id: Ie877e976b20d3448fc1f12a1c775942d626a12fc Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Fix jgit packagingMatthias Sohn2020-06-034-34/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - new jsch and gpg.bc fragments need to be included in their features as fragments and require only the jgit bundle (not the jgit feature) - feature org.eclipse.jgit should no longer include bouncycastle - add missing url for gpg.bc feature in category.xml - don't mark features as patch features Change-Id: I4a46e3fed319221a704b754347a6798b4b199fe4
* | | Fix InvalidInlineTag error flagged by error proneDavid Ostrovsky2020-06-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running recent error prone version complaining on that code: RefDatabase.java:444: error: [InvalidInlineTag] Tag name `linkObjectId` is unknown. * Includes peeled {@linkObjectId}s. This is the inverse lookup of ^ (see https://errorprone.info/bugpattern/InvalidInlineTag) Bug: 562756 Change-Id: If91da51d5138fb753c0550eeeb9e3883a394123d Signed-off-by: David Ostrovsky <david@ostrovsky.org>
* | | Fix BadComparable error flagged by error proneDavid Ostrovsky2020-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running recent error prone version complaining on that code: LfsPointer.java:171: error: [BadComparable] Possible sign flip from narrowing conversion return (int) (getSize() - o.getSize()); ^ (see https://errorprone.info/bugpattern/BadComparable) Did you mean 'return Long.compare(getSize(), o.getSize());'? Bug: 562756 Change-Id: I0522f1025319a9290c448a064fbafdb4b16d1d59 Signed-off-by: David Ostrovsky <david@ostrovsky.org>
* | | Add tests for RawTextComparator.WS_IGNORE_CHANGE.hash()Thomas Wolf2020-06-021-0/+44
| | | | | | | | | | | | Change-Id: I1ed4df789094e09c39b3c2054fe5b9bd0c1a8f9b Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | Update Orbit to R20200529191137 for final Eclipse release 2020-06Thomas Wolf2020-06-0123-99/+165
| | | | | | | | | | | | | | | | | | | | | | | | This includes org.bouncycastle.bcprov 1.65.1 in the p2 repository. Leave the maven and bazel dependencies for Bouncy Castle at 1.65. Change-Id: I1fb39bd79e7339315f64f8b5dda89cb81dd035af Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | Organize manifest of org.eclipse.jgit.pgmMatthias Sohn2020-06-011-30/+18
| | | | | | | | | | | | | | | | | | | | | | | | Use "organize manifest" to auto-cleanup the manifest of org.eclipse.jgit.pgm. This removes some unused imports and unnecessary manifest headers and updates use clauses. Change-Id: Iacbd6d3b184c6fa8db28d9f06cbf56e57cc8ef5d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Do not include log4j implementation in jgitMichael Keppler2020-06-013-17/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed in the bug, jgit should not include a logging implementation, and instead rely on the product containing jgit to configure the logging. We have recently run into the situation, that installing egit in a (non eclipse.org) RCP application breaks all the logging due to incompatible logging implementations. Removal of the jgit logging implementation should fix this. Following further changes have been done for jgit command line: * added log4j.properties to binary build of jgit.pgm. That file existed in the git repository, but was not included in the eclipse binary build. (maybe it is in the bazel build) * removed apache.commons.logging package import from jgit.pgm. That import is not used, and makes the logging even more confusing. Bug: 514326 Change-Id: I6dc7d1462f0acfca9e2b1ac87e705617179ffdda Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Decouple JSch from JGit CoreMatthias Sohn2020-06-01140-180/+2910
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Motivation: JSch serves as 'default' implementations of the SSH transport. If a client application does not use it then there is no need to pull in this dependency. Move the classes depending on JSch to an OSGi fragment extending the org.eclipse.jgit bundle and keep them in the same package as before since moving them to another package would break API. Defer moving them to a separate package to the next major release. Add a new feature org.eclipse.jgit.ssh.jsch feature to enable installation. With that users can now decide which of the ssh client integrations (JCraft JSch or Apache Mina SSHD) they want to install. We will remove the JCraft JSch integration in a later step due to the reasons discussed in bug 520927. Bug: 553625 Change-Id: I5979c8a9dbbe878a2e8ac0fbfde7230059d74dc2 Also-by: Michael Dardis <git@md-5.net> Signed-off-by: Michael Dardis <git@md-5.net> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: David Ostrovsky <david@ostrovsky.org>
* | | Decouple BouncyCastle from JGit CoreMatthias Sohn2020-06-0175-142/+2836
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Motivation: BouncyCastle serves as 'default' implementation of the GPG Signer. If a client application does not use it there is no need to pull in this dependency, especially since BouncyCastle is a large library. Move the classes depending on BouncyCastle to an OSGi fragment extending the org.eclipse.jgit bundle. They are moved to a distinct internal package in order to avoid split packages. This doesn't break public API since these classes were already in an internal package before this change. Add a new feature org.eclipse.jgit.gpg.bc to enable installation. With that users can now decide if they want to install it. Attempts to sign a commit if org.eclipse.jgit.gpg.bc isn't available will result in ServiceUnavailableException being thrown. Bug: 559106 Change-Id: I42fd6c00002e17aa9a7be96ae434b538ea86ccf8 Also-by: Michael Dardis <git@md-5.net> Signed-off-by: Michael Dardis <git@md-5.net> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: David Ostrovsky <david@ostrovsky.org>
* | | Verify that the user home directory is validThomas Wolf2020-05-313-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the determination of the user home directory produces a Java File object with an invalid path, spurious exceptions may occur at the most inopportune moments anytime later. In the case in the linked bug report, start-up of EGit failed, leading to numerous user-visible problems in Eclipse. So validate the return value of FS.userHomeImpl(). If converting that File to a Path throws an exception, log the problem and fall back to Java system property user.home. If that also is not valid, use null. (A null user home directory is allowed by FS, and calling in Java new File(null, "some_string") is fine and produces a File relative to the current working directory.) Bug: 563739 Change-Id: If9eec0f9a31a45bd815231706285c71b09f8cf56 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | WindowCache: conditional JMX setupThomas Wolf2020-05-292-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to programmatically suppress the JMX bean registration. In EGit it is not needed but can be rather costly because it occurs during plug-in activation and accesses the git user config. Bug: 563740 Change-Id: I07ef7ae2f0208d177d2a03862846a8efe0191956 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | Merge "RawTextComparator.WS_IGNORE_CHANGE must not compare whitespace"Christian Halstrick2020-05-282-17/+39
|\ \ \
| * | | RawTextComparator.WS_IGNORE_CHANGE must not compare whitespaceThomas Wolf2020-05-282-17/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only the presence or absence of whitespace is significant; but not the actual whitespace characters. Don't compare whitespace bytes. Compare the C git implementation at [1]. [1] https://github.com/git/git/blob/0d0e1e8/xdiff/xutils.c#L173 Bug: 563570 Change-Id: I2d0522b637ba6b5c8b911b3376a9df5daa9d4c27 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | Revert "PackBitmapIndex: Not buffer inflated bitmap in BasePackBitmapIndex"Yunjie Li2020-05-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3aee92478c2cbc67cd921533437b824e43ed9798, which increased fetch latency significantly. Change-Id: Id31a94dff83bf7ab2121718ead819bd08306a0b6 Signed-off-by: Yunjie Li <yunjieli@google.com>
* | | | Update jetty to 9.4.28.v20200408Matthias Sohn2020-05-2714-229/+229
| | | | | | | | | | | | | | | | Change-Id: I6fe26c1efcf812de3102ee82ce67f9e0bc3b0135 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Add 4.16 staging target platformMatthias Sohn2020-05-265-10/+112
|/ / / | | | | | | | | | | | | | | | | | | * replace 4.15 staging by 4.15 release * add 4.16 staging Change-Id: I33cc701f0ea6fffeaec898fa50ef536b20102048 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | In-memory SSH keys for the "no files" sshd testsThomas Wolf2020-05-233-49/+52
| | | | | | | | | | | | | | | | | | | | | Avoid using a key written to a file. This makes it clearer that the test does not rely on files being present. Change-Id: I31cf4f404aab5b891c32fc4bda906b7f8fe03777 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | Builder API to configure SshdSessionFactoriesThomas Wolf2020-05-237-52/+746
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A builder API provides a more convenient way to define a customized SshdSessionFactory by hiding the subclassing. Also provide a new interface SshConfigStore to abstract away the specifics of reading a ssh config file, and provide a way to customize the concrete ssh config implementation to be used. This facilitates using an alternate ssh config implementation that may or may not be based on files. Change-Id: Ib9038e8ff2a4eb3a9ce7b3554d1450befec8e1e1 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | TransportHttp: abort on time-out or on SocketExceptionThomas Wolf2020-05-232-0/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid trying other authentication methods on SocketException or on InterruptedIOException. SocketException is rather fatal, such as nothing listening on the peer's port, connection reset, or it could be a connection time-out. Time-outs enforced by Timeout{Input,Output}Stream may result in InterruptedIOException being thrown. In both cases, it makes no sense to try other authentication methods, and doing so may wrongly report "authentication not supported" or "cannot open git-upload-pack" or some such instead of reporting a time-out. Bug: 563138 Change-Id: I0191b1e784c2471035e550205abd06ec9934fd00 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | Merge "Bazel: Remove superfluous dependencies flagged by unused_deps"David Pursehouse2020-05-234-6/+1
|\ \ \
| * | | Bazel: Remove superfluous dependencies flagged by unused_depsDavid Ostrovsky2020-05-224-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bazel buildtools project includes in addition to buildifier also unused deps and buildozer utilities, that detect unused dependencies and fix them by applying the removal to the build files. This change is created by installing unused_deps from buildtools@HEAD and running: $ unused_deps //... and applying the suggested modifications. Change-Id: Iad74ec2fa719475b29391586f40b13ae30477004 Signed-off-by: David Ostrovsky <david@ostrovsky.org>
* | | | Ignore core.eol if core.autocrlf=inputThomas Wolf2020-05-222-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Config core.eol is to be ignored if core.autocrlf is true or input.[1] JGit didn't do so when core.autocrlf=input was set. [1] https://git-scm.com/docs/git-config#Documentation/git-config.txt-coreeol Bug: 561877 Change-Id: I5e62e0510d160b5113c1090319af09c2bc1bcb59 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | Attributes: fix handling of text=auto in combination with eolThomas Wolf2020-05-223-7/+117
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Git 2.10.0 the interpretation of gitattributes changed or was fixed such that "* text=auto eol=crlf" would indeed still do auto-detection of text vs. binary content.[1] Previously this was identical to "* text eol=crlf", i.e., treating all files as text. JGit still did the latter, which caused surprises because it changed binary files. [1] https://github.com/git/git/blob/master/Documentation/RelNotes/2.10.0.txt#L248 Bug: 561341 Change-Id: I5b6fb97b5e86fd950a98537b6b8574f768ae30e5 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | Log stack trace if CachingKeyPairProvider hits unexpected exceptionMatthias Sohn2020-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | Log the stack trace in order to help understanding the bug 563380 Bug: 563380 Change-Id: If993a63ccec5042b10e1d5e945b18f4b5f06d8ff Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 03:58:12 +0000