summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update jna to 5.15.0Matthias Sohn2024-10-0121-60/+60
| | | | Change-Id: I164964b2173ee285d35d6d3a29caf30c0b8a6f95
* Update bytebuddy to 1.15.3Matthias Sohn2024-10-0121-60/+60
| | | | Change-Id: Ib17b92d6f413f706ff97fb4ccf07847f4b5808ad
* Update commons-io:commons-io to 2.17.0Matthias Sohn2024-10-0121-40/+40
| | | | Change-Id: Ib3030b917ffb1a02115345e9050180313efdc19b
* Merge "Record failing paths in recursive merge."Ivan Frade2024-09-272-3/+20
|\
| * Record failing paths in recursive merge.jackdt@google.com2024-09-232-3/+20
| | | | | | | | | | | | | | | | This is meant to help diagnose LOCK_FAILURE errors, which otherwise provides very little information in https://eclipse.googlesource.com/jgit/jgit/+/refs/heads/master/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java#731. Change-Id: I3d544c899fe66effbd107ea2f38d73f6f253a7e6
* | Merge "FileRepository: Remove unnecessary setConfig call"Ivan Frade2024-09-271-2/+0
|\ \
| * | FileRepository: Remove unnecessary setConfig callIvan Frade2024-09-271-2/+0
| | | | | | | | | | | | | | | | | | | | | The constructor of GC sets exactly the same config. Remove this set to make clearer from where the config is coming. Change-Id: Idb71c7827f180923092ef5392545df81960ee93a
* | | Merge "DfsInserter: Create PackConfig from repo instead of repo.conf"Ivan Frade2024-09-271-1/+1
|\| |
| * | DfsInserter: Create PackConfig from repo instead of repo.confIvan Frade2024-09-241-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | PackConfig can be constructed from the repo or from a config. While browing the code, it is easier to follow the provenance of the configuration when using the repository constructor. Use the PackConfig(Repository) constructor in the DfsInserter. Internally it calls PackConfig(repo.getConfig()) so this should be a noop. Change-Id: Ifce5bc87404ca8ec9a821d28253d489056faad9a
* | Merge branch 'stable-7.0'Matthias Sohn2024-09-261-3/+2
|\ \ | |/ |/| | | | | | | | | * stable-7.0: AdvertisedRequestValidator: fix WantNotValidException caused by race Change-Id: If885f81c5273693c0c9c6efcfe4b646ab936cefe
| * Merge branch 'stable-6.10' into stable-7.0Matthias Sohn2024-09-261-3/+2
| |\ | | | | | | | | | | | | | | | | | | * stable-6.10: AdvertisedRequestValidator: fix WantNotValidException caused by race Change-Id: I22ec79d91136f8209a3799465db5593d83f7bea9
| | * Merge branch 'stable-6.9' into stable-6.10Matthias Sohn2024-09-261-3/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.9: AdvertisedRequestValidator: fix WantNotValidException caused by race Change-Id: I662c7a76470cedf0d4c975c50c3981c1c86245f2
| | | * Merge branch 'stable-6.8' into stable-6.9stable-6.9Matthias Sohn2024-09-261-3/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.8: AdvertisedRequestValidator: fix WantNotValidException caused by race Change-Id: Ia5a0a4f0e900d96fa638bb9f97988ac66f4b7068
| | | | * Merge branch 'stable-6.7' into stable-6.8stable-6.8Matthias Sohn2024-09-261-3/+2
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.7: AdvertisedRequestValidator: fix WantNotValidException caused by race Change-Id: I1e485422608cf55373c1d86c4c0d50c9f9f49f20
| | | | | * Merge branch 'stable-6.6' into stable-6.7stable-6.7Matthias Sohn2024-09-261-3/+2
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.6: AdvertisedRequestValidator: fix WantNotValidException caused by race Change-Id: I5b7b097a4b57ec48a3ee20fc25cb0d080cc1af80
| | | | | | * AdvertisedRequestValidator: fix WantNotValidException caused by racestable-6.6Matthias Sohn2024-09-251-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetch with protocol V2 failed under the following conditions - fetch uses bidirectional protocol (git, ssh) which uses a shortcut to determine invalid wants - not all wants are advertised - race condition: wanted ref is updated during fetch by another thread after the thread serving upload-pack determined wants and before it checks not advertised wants Fix this by calling `new ReachableCommitRequestValidator().checkWants(up, wants)` instead of throwing WantNotValidException in [1] if this race happened in the same way like it's done for unidirectional protocols (http) [2]. [1] https://github.com/eclipse-jgit/jgit/blob/stable-6.10/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java#L2002 [2] https://github.com/eclipse-jgit/jgit/blob/stable-6.10/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java#L2000 Bug: jgit-48 Change-Id: I32f28502923815dc49781aab5d810c9afbe7e7e6
* | | | | | | Merge "DfsReader: Fallback to regular size read if size index throws"Ivan Frade2024-09-201-13/+48
|\ \ \ \ \ \ \
| * | | | | | | DfsReader: Fallback to regular size read if size index throwsIvan Frade2024-09-191-13/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reader can get IOException when reading the object size index, but that index is an optimization, the size should still be available in the pack. Use the regular #getObjectSize() as a fallback when we get an IOException from the object size index. Change-Id: Ic5ec2cfc7c698aa94c6cfd5960cbab6c129f595a
* | | | | | | | PackIndex: Add protected setters to populate the MutableEntryjackdt@google.com2024-09-193-15/+53
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implementations of the iterator out of package receive a MutableEntry but they don't have a way to set data into it. Add setters to the MutableEntry via protected methods in the iterator. This way, only implementors of the Iterator can modify the entry (cannot be modified e.g. by callers). Change-Id: Id50c69d8be230ebdb8108acc47df13abcad0af0a
* | | | | | | PackWriter: Remove constructor with only Reader as paramIvan Frade2024-09-163-15/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At construction time, PackWriter receives the PackConfig as a parameter or reads it from the repository. The only exception is when the constructor receives only a reader (no repo nor conf provided?!). Remove PackWriter(Reader) and let callers be explicit what conf to use. This makes clearer the flow of conf in the PackWriter. Change-Id: If12e122797ffc8c44fc3c435ca1b000ca016645b
* | | | | | | PackIndex: Simplify Iterator/MutableEntry interactionjackdt@google.com2024-09-133-63/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The iterator keeps the current position in the index and the MutableEntry reads data from there on-demand, but the iterator needs to know about the entry and this creates a complicated interaction. Make MutableEntry a simple data object and let the iterator iterate and populate it before returning it. Code is clearer and implementors only needs to worry about the iterator. This fixes also MutableEntry visibility, that was preventing subclassing from out of the package. Change-Id: I35010d1f80237e421dd51b8d3d61a8ecb03e0d01
* | | | | | | Update org.mockito:mockito-core to 5.13.0Matthias Sohn2024-09-1221-40/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7aa2a3ee8e5ad107992309ea1fd82eaa73bf59d6
* | | | | | | Update to jetty 12.0.13Matthias Sohn2024-09-1221-188/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I05772a87c351fed631d386c034e01fca9ec38fb1
* | | | | | | Update org.apache.commons:commons-lang3 to 3.17.0Matthias Sohn2024-09-1220-39/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I27a657a424050f0d7cacaec0f504c00f2c77b62a
* | | | | | | Update bytebuddy to 1.15.1Matthias Sohn2024-09-1221-60/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I244dab5dec191497ad794cd16884f2392d0fa3b8
* | | | | | | Add 4.34 target platform for Eclipse 2024-12Matthias Sohn2024-09-124-1/+326
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and update org.apache.ant to 1.10.15 since Orbit updated to Ant 1.10.15. See https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12/ Change-Id: I865decbad55f0b7ca998b37cafa6c0a1eb183734
* | | | | | | Use 2024-09 release repository in 4.33 target platformMatthias Sohn2024-09-122-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I30e6d8cf0690184f081d7f39d5733d4e46b86e0c
* | | | | | | PackReverseIndex: Fix javadoc in position methodsjackdt@google.com2024-09-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Position in the API refers to reverse-index position (offset order), not primary index position (sha1 order) Change-Id: I7dbe314dac1b3a128dd1c4ed93b9be28fd0802cc
* | | | | | | Replace custom encoder `Constants#encode` by JDK implementationMatthias Sohn2024-09-061-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the implementation provided in the JDK since Java 1.6 by `String#getBytes(Charset)` reduces JGit maintenance effort and improves performance. The method Constants#encode was implemented when JGit still used Java 1.5. See [1]. Kudos to Marcin for proposing to use this improvement in RefWriter [2]. I think it should be used generally. [1] https://repo.or.cz/jgit.git?a=commit;h=bfa3da225f198b19061158499b1135aff07d85b3 [2] https://eclipse.gerrithub.io/c/eclipse-jgit/jgit/+/1195180 Also-By: Marcin Czech <maczech@gmail.com> Change-Id: I361ed6286b98351a315b8a8ffc3cb845831d35b2
* | | | | | | [releng] Bump japicmp base version to 7.0.0.202409031743-rThomas Wolf2024-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5245a8b095174946abcbbb899f9c0a7dfd504cb4 Signed-off-by: Thomas Wolf <twolf@apache.org>
* | | | | | | Prepare 7.1.0-SNAPSHOT buildsMatthias Sohn2024-09-0389-531/+531
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iba206a2d4645fc275cd2cd1cb3ae965b8ceafb28
* | | | | | | Merge branch 'stable-7.0'Matthias Sohn2024-09-03152-5552/+4493
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-7.0: Prepare 7.0.1-SNAPSHOT builds JGit v7.0.0.202409031743-r Revert "Remove deprecated LocalDiskRepositoryTestCase#create(boolean,boolean)" Remove deprecated JschSession#getSftpChannel method Remove deprecated AutoLFInputStream constructors Remove deprecated RawParseUtils#UTF8_CHARSET Remove deprecated FS#setAsyncFileStoreAttributes method FS, FS_Posix: remove deprecated #createNewFile(File) method Remove deprecated lastModified methods using long UserAgent: remove deprecated #getAgent, #hasAgent methods Remove deprecated Transport#getFilterBlobLimit methods Remove deprecated RefAdvertiser#send(Map<String, Ref>) method Remove deprecated ReceivePack#setEchoCommandFailures method Remove deprecated class ReceivePack.FirstLine PacketLineIn: make deprecated #END and #DELIM private WindowCacheStats: remove deprecated #getOpenFiles, #getOpenBytes Remove deprecated PatchApplier#applyPatch(InputStream) Remove deprecated MergeMessageFormatter#formatWithConflicts Remove deprecated MergeFormatter#formatMerge using charset name Remove deprecated MergeFormatter#formatMerge using charset name Remove deprecated TagBuilder#toByteArray method Remove deprecated Repository#hasObject(AnyObjectId) method Make deprecated Repository#peel(Ref) private Remove deprecated RefDatabase#getRef(String) method CoreConfig: remove deprecated #isLogAllRefUpdates method Constants: remove deprecated #CHARSET and #CHARACTER_ENCODING Remove deprecated ConfigConstants#CONFIG_KEY_STREAM_FILE_TRESHOLD Remove deprecated CommitBuilder#setEncoding(String) method Remove deprecated static #equals(AnyObjectId, AnyObjectId) method Remove deprecated FileSnapshot.save(long) method Remove deprecated lastModified accessors returning long Remove deprecated PackInvalidException constructors DirCacheEntry: remove deprecated methods Remove deprecated DirCacheCheckout#checkoutEntry methods Remove deprecated StashApplyCommand#setApplyUntracked method Remove deprecated StashApplyCommand#setApplyIndex method Remove deprecated RemoteSetUrlCommand#setUri method Remove deprecated RemoteSetUrlCommand#setPush method Remove deprecated RemoteSetUrlCommand#setName method Remove deprecated RemoteRemoveCommand#setName method Remove deprecated CheckoutCommand#setForce method Remove deprecated CheckoutCommand#setForce method Remove deprecated static AnyLongObjectId#equals method Remove deprecated LocalDiskRepositoryTestCase#create(boolean,boolean) Remove unused API warning filters ObjectDirectoryTest: ensure WindowCursor is closed PackExtBlockCacheTableTest: fix empty block warning PackExtBlockCacheTableTest: suppress unchecked conversion warnings PackObjectSizeIndexV1: fix boxing warnings PackExtBlockCacheTableTest: suppress boxing warning on test class DfsBlockCacheConfigTest: suppress boxing warning on test class Suppress non-externalized string warnings Update jakarta.servlet:jakarta.servlet-api to 6.1.0 Update org.apache.commons:commons-compress to 1.27.1 Update org.tukaani:xz to 1.10 Update org.assertj:assertj-core to 3.26.3 Update org.apache.commons:commons-lang3 to 3.16.0 Update bytebuddy to 1.15.0 Update commons-logging:commons-logging to 1.3.4 Update commons-codec:commons-codec to 1.17.1 Update jetty to 12.0.12 Prepare 7.0.0-SNAPSHOT builds JGit v7.0.0.202408271414-rc1 Prepare 7.0.0-SNAPSHOT builds JGit v7.0.0.202408202050-m3 JGit v7.0.0.202408201547-m3 JGit v7.0.0.202409201410-m3 Change-Id: Ia2913076aa8ecdfa0c51752a6076658505f6736e
| * | | | | | Prepare 7.0.1-SNAPSHOT buildsMatthias Sohn2024-09-0389-531/+531
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a6a9e398d8b81bf7bd0afbd6c82116d4472a349
| * | | | | | JGit v7.0.0.202409031743-rv7.0.0.202409031743-rMatthias Sohn2024-09-0389-123/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I86507936091e6f7af7588835722672ff2668a205
| * | | | | | Revert "Remove deprecatedMatthias Sohn2024-09-032-6/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LocalDiskRepositoryTestCase#create(boolean,boolean)" This reverts commit 3682611cef41ade46cf5ac194f0674b46367a395. Reason: removing this deprecated method caused a ton of warnings about closing an already closed Repository when running tests. Change-Id: I3e9f224c55c167f92dad39caabfab5e43cf54cfb
| * | | | | | Remove deprecated JschSession#getSftpChannel methodMatthias Sohn2024-09-031-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5b5d3cbc6b0e5f85df26fe6c288c973cf5609296
| * | | | | | Remove deprecated AutoLFInputStream constructorsMatthias Sohn2024-09-031-38/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I00241e45d947582886658fa528cc20a961fed9e6
| * | | | | | Remove deprecated RawParseUtils#UTF8_CHARSETMatthias Sohn2024-09-031-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4b3f1344f77a575b2d0e00462806eddb4e9a6b80
| * | | | | | Remove deprecated FS#setAsyncFileStoreAttributes methodMatthias Sohn2024-09-031-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iea9f61fd65772ab247b382c93035e3c9974705aa
| * | | | | | FS, FS_Posix: remove deprecated #createNewFile(File) methodMatthias Sohn2024-09-032-86/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id34a0be998eee360e69f74b469c4990afa153c1b
| * | | | | | Remove deprecated lastModified methods using longMatthias Sohn2024-09-034-116/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from - FileUtils#lastModified - FileUtils#setLastModified - FS#getLastModifiedTime - FS#lastModified - FS#setLastModified - FileTreeIterator.Entry#getEntryLastModified - WorkingTreeIterator#getEntryLastModified - WorkingTreeIterator.Entry#getEntryLastModified Change-Id: I5073f05c32f8f626383a91048470c79332983121
| * | | | | | UserAgent: remove deprecated #getAgent, #hasAgent methodsMatthias Sohn2024-09-031-41/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib53de6dabea7f73ecfde85cb30f49fa05ee48551
| * | | | | | Remove deprecated Transport#getFilterBlobLimit methodsMatthias Sohn2024-09-031-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia72cc228b0acaa8df8f405bd224916cc76eadd22
| * | | | | | Remove deprecated RefAdvertiser#send(Map<String, Ref>) methodMatthias Sohn2024-09-031-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifffcfa6bf9baf9f6879a5a7e0f05d317347983f6
| * | | | | | Remove deprecated ReceivePack#setEchoCommandFailures methodMatthias Sohn2024-09-031-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieeeb33b8b3dc8272023af5d47b3330f4a94c5b96
| * | | | | | Remove deprecated class ReceivePack.FirstLineMatthias Sohn2024-09-031-46/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1143612088dba4fdced8f14c97293d17ff9658bb
| * | | | | | PacketLineIn: make deprecated #END and #DELIM privateMatthias Sohn2024-09-031-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1b7ba9f7e3dffe54313fc5d27051ad56a02a05b9
| * | | | | | WindowCacheStats: remove deprecated #getOpenFiles, #getOpenBytesMatthias Sohn2024-09-031-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If254177fd7914cb1f909f6620032bb4016208855
| * | | | | | Remove deprecated PatchApplier#applyPatch(InputStream)Matthias Sohn2024-09-031-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I79923b95861af983b676d436938aaeebe8c5b658
| * | | | | | Remove deprecated MergeMessageFormatter#formatWithConflictsMatthias Sohn2024-09-031-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3040f655318c47f268433294720a99325ae78863
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 21:38:16 +0000