aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * | | 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-161-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | 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
* | | | | | | | Prepare 7.1.0-SNAPSHOT buildsMatthias Sohn2024-09-033-59/+59
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Iba206a2d4645fc275cd2cd1cb3ae965b8ceafb28
* | | | | | | Prepare 7.0.1-SNAPSHOT buildsMatthias Sohn2024-09-033-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a6a9e398d8b81bf7bd0afbd6c82116d4472a349
* | | | | | | JGit v7.0.0.202409031743-rv7.0.0.202409031743-rMatthias Sohn2024-09-033-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I86507936091e6f7af7588835722672ff2668a205
* | | | | | | 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
* | | | | | | Remove deprecated MergeFormatter#formatMerge using charset nameMatthias Sohn2024-09-031-31/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7d0bdb61a8698e94bb40c22fe1c40c70cec65dfc
* | | | | | | Remove deprecated MergeFormatter#formatMerge using charset nameMatthias Sohn2024-09-031-34/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id2bdcb865203ed192fea35cfcf82c34667710726
* | | | | | | Remove deprecated TagBuilder#toByteArray methodMatthias Sohn2024-09-031-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I14e78bcd4bbdb491bcc44a53ff19609b79c0831b
* | | | | | | Remove deprecated Repository#hasObject(AnyObjectId) methodMatthias Sohn2024-09-031-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I473dff6bdc23cfb126d22e18c168390a0e21301d
* | | | | | | Make deprecated Repository#peel(Ref) privateMatthias Sohn2024-09-031-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1c16196bba00a5d0f54c10261cc08185305ba4a3
* | | | | | | Remove deprecated RefDatabase#getRef(String) methodMatthias Sohn2024-09-031-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I89f42db2b9dabee18d4220457436b9f9b6340f50
* | | | | | | CoreConfig: remove deprecated #isLogAllRefUpdates methodMatthias Sohn2024-09-031-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4e5f96696b57512488f48e66a82760b2e8671878
* | | | | | | Constants: remove deprecated #CHARSET and #CHARACTER_ENCODINGMatthias Sohn2024-09-031-23/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If2d3c1a96560e0bc5e352bdbcab4c191cbed1a42
* | | | | | | Remove deprecated ConfigConstants#CONFIG_KEY_STREAM_FILE_TRESHOLDMatthias Sohn2024-09-031-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3521ba8f8456160bd18ccb22c7d4a131aaac4ff2
* | | | | | | Remove deprecated CommitBuilder#setEncoding(String) methodMatthias Sohn2024-09-031-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5bd8d0c292151bfa58325d51ef51928715871cf1
* | | | | | | Remove deprecated static #equals(AnyObjectId, AnyObjectId) methodMatthias Sohn2024-09-031-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I72544d2b3c85b8f96c2b8f94b86fb9b362f09475
* | | | | | | Remove deprecated FileSnapshot.save(long) methodMatthias Sohn2024-09-031-23/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9b77142127cc96ee6658e85a6cf0586d941c5c0c
* | | | | | | Remove deprecated lastModified accessors returning longMatthias Sohn2024-09-032-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - FileSnapshot#lastModified - LockFile#getCommmitLastModified Change-Id: I6962166ca5decbb332dfb25851c93debfe2ca90c
* | | | | | | Remove deprecated PackInvalidException constructorsMatthias Sohn2024-09-031-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8db6b1dd8e39811ebde676389833dbc906106452
* | | | | | | DirCacheEntry: remove deprecated methodsMatthias Sohn2024-09-031-50/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - boolean mightBeRacilyClean(int, int) - long getLastModified() - void setLastModified(long) Change-Id: I428fbb2109e13e80b8655622531c10e55a922a6f
* | | | | | | Remove deprecated DirCacheCheckout#checkoutEntry methodsMatthias Sohn2024-09-031-121/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I28d00d7a70af0fbb76e237dd77b929508720ecdb
* | | | | | | Remove deprecated StashApplyCommand#setApplyUntracked methodMatthias Sohn2024-09-031-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I23e3ed3259edad3a22b59cca938f041b39ebf0cb
* | | | | | | Remove deprecated StashApplyCommand#setApplyIndex methodMatthias Sohn2024-09-031-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2183285f6ccba1b62a318e711f2451df5d083ca1
* | | | | | | Remove deprecated RemoteSetUrlCommand#setUri methodMatthias Sohn2024-09-031-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib9041be0d88dd837aa68eda2b00f3aa9ebc54c27
* | | | | | | Remove deprecated RemoteSetUrlCommand#setPush methodMatthias Sohn2024-09-031-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4026531148a7560179dae89c05424f256e6600d2
* | | | | | | Remove deprecated RemoteSetUrlCommand#setName methodMatthias Sohn2024-09-031-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I769e999b5990f83719e3c638da9dfd0be4c5b826
* | | | | | | Remove deprecated RemoteRemoveCommand#setName methodMatthias Sohn2024-09-031-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2bd2a213b4642283b11f787ffcbab29916e2c5e7
* | | | | | | Remove deprecated CheckoutCommand#setForce methodMatthias Sohn2024-09-031-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie0b59ec21fc8dbe18242bbb52cb794e5a02c1ed5
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-22 15:40:33 +0000