aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | DiffDriver: fix formatting of javadocMatthias Sohn2024-11-201-10/+10
| | | | | | | | | | | | Change-Id: I01da1862719b6623727deae10a706f30ee6cabbf
| * | Merge "Add numberOfObjectsSinceBitmap to RepoStatistics" into stable-6.10Matthias Sohn2024-11-202-7/+93
| |\ \
| | * | Add numberOfObjectsSinceBitmap to RepoStatisticsJacek Centkowski2024-11-202-7/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a numberOfObjectsSinceBitmap that contains the number of objects stored in pack files and as loose objects created since the latest bitmap generation. Note that the existing GcNumberOfPackFilesAfterBitmapStatisticsTest.java was renamed to GcSinceBitmapStatisticsTest.java and extended to cover also this statistic. Change-Id: I8ae1db142ddfcd42a5a1d6da01bc67f695562e0e
| * | | Merge "Don't fail when trying to prune pack which is already gone" into ↵Luca Milanesio2024-11-202-80/+5
| |\| | | | | | | | | | | | | | stable-6.10
| | * | Don't fail when trying to prune pack which is already goneJacek Centkowski2024-11-202-80/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the TestRepository.prunePacked so that it doesn't fail if a pack to be pruned is already gone. It is especially handy when the prunePacked function is called in `TestRepository.packAndPrune` function after the repo moves on after GC was performed. Change-Id: I01b4ddbaddec1fdc24cfbb967e0edfe0de6c4b7c
| * | | Merge "Support built-in diff drivers for hunk header function names" into ↵Matthias Sohn2024-11-2010-13/+606
| |\ \ \ | | |/ / | |/| | | | | | stable-6.10
| | * | Support built-in diff drivers for hunk header function namesKaushik Lingarkar2024-11-2010-13/+606
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The regexes defined for each built-in driver will be used to determine the function name for a hunk header. Each driver can specify a list of regexes to negate and match. They can also define pattern compilation flags if needed. These drivers only apply to text files with unified patch type. Following built-in drivers have been added: - cpp - dts - java - python - rust Support for more languages can be added as needed to match the cgit implementation. Change-Id: Ice5430bfed7e4aaf9f00e52e44402479984953c5
| * / Rename numberOfPackFilesAfterBitmap to numberOfPackFilesSinceBitmapJacek Centkowski2024-11-122-11/+11
| |/ | | | | | | | | | | As sugested in I608011462f1. Change-Id: If66226dd7b08ae768413fa614df5dcb6b44dc118
* | Merge branch 'stable-6.10' into stable-7.0Matthias Sohn2024-11-114-23/+206
|\| | | | | | | | | | | | | | | | | | | * stable-6.10: Replace custom encoder Constants#encodeASCII by JDK implementation Replace custom encoder `Constants#encode` by JDK implementation Add `numberOfPackFilesAfterBitmap` to RepoStatistics Enhance CommitBuilder#parent to tolerate null parent Change-Id: If05b0d474c728b54cab9af2b7416be30b2754d1b
| * Replace custom encoder Constants#encodeASCII by JDK implementationMatthias Sohn2024-11-091-7/+13
| | | | | | | | | | | | | | | | Ensure that the method still throws an IllegalArgumentException for malformed input or if the String contains unmappable characters. Change-Id: I6a340aa1af60c315272ff13b6bf2041ba30c94ca (cherry picked from commit 0fd76114e3436ac635641d06371fd8833179312d)
| * Replace custom encoder `Constants#encode` by JDK implementationMatthias Sohn2024-11-091-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 (cherry picked from commit e5d2898997462e0f2409c09497ab62c6cda2dbaf)
| * Add `numberOfPackFilesAfterBitmap` to RepoStatisticsJacek Centkowski2024-11-072-1/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a `numberOfPackFilesAfterBitmap` that contains the number of packfiles created since the latest bitmap generation. Notes: * the `repo.getObjectDatabase().getPacks()` that obtains the list of packs (in the existing `getStatistics` function) uses `PackDirectory.scanPacks` that boils down to call `PackDirectory.scanPacksImpl` which is sorting packs prior returning them therefore the `numberOfPackFilesAfterBitmap` is just all packs before the one that has bitmap attached * the improved version of `packAndPrune` function (one that skips non-existent packfiles) was introduced for testing Change-Id: I608011462f104fc002ac527aa405f492a8a4b0c2
| * Enhance CommitBuilder#parent to tolerate null parentMatthias Sohn2024-11-071-3/+7
| | | | | | | | Change-Id: Ifdeafd040bca8331804c3e7568da0bee5cbd01df
* | Merge branch 'stable-6.10' into stable-7.0Matthias Sohn2024-11-059-4/+440
|\| | | | | | | | | | | | | | | * stable-6.10: ResolveMerger: Allow setting the TreeWalk AttributesNodeProvider Add Union merge strategy support Change-Id: I0d768d793effd1deabb4807446a4f8c10a82ad74
| * ResolveMerger: Allow setting the TreeWalk AttributesNodeProviderNasser Grainawi2024-11-052-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | When a merger is created without a Repository, no AttributesNodeProvider is created in the TreeWalk. Since mergers are often created with a custom ObjectInserter and no repo, they skip any lookups of attributes from any of the gitattributes files (within a tree, in the repo info/ dir, or user/global). Since there are potentially merge-affecting attributes in those files, callers might want to use both a custom ObjectInserter and an AttributesNodeProvider. Change-Id: I7997309003bbb598e1002261b3be7f2cc52066c8
| * Add Union merge strategy supportNasser Grainawi2024-11-047-4/+430
| | | | | | | | | | | | | | | | | | Allow users to specify the `union` strategy in their .gitattributes file in order to keep lines from both versions of a conflict [1]. [1] https://git-scm.com/docs/gitattributes.html#Documentation/gitattributes.txt-union Change-Id: I74cecceb2db819a8551b95fb10dfe7c2b160b709
* | Merge branch 'stable-6.10' into stable-7.0Matthias Sohn2024-10-2327-155/+157
|\| | | | | | | | | | | | | | | | | | | | | * stable-6.10: Update Apache sshd to 2.14.0 LfsConnectionFactoryTest: remove unnecessary cast JSchSshProtocol2Test: remove unnecessary cast ApacheSshProtocol2Test: remove unnecessary cast NoteMapMerger: remove unnecessary cast Change-Id: I8fca74d88efadc827955b0a5032e6fbd72ce3e0d
| * Update Apache sshd to 2.14.0Matthias Sohn2024-10-1022-145/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an 'incorrect signature' error when trying to use the keys generated by SSHD during server init with an OpenSSH client. This also includes a few other changes since 2.13.2: * GH-524 Performance improvements * GH-533 Fix multi-step authentication * GH-582 Fix filtering in NamedFactory * GH-587 Prevent NullPointerExceptionon closed channel in NettyIoSession * GH-590 Better support for FIPS * GH-597 Pass on Charset in ClientSession.executeRemoteCommand() https://github.com/apache/mina-sshd/releases/tag/sshd-2.14.0 Change-Id: I76909fd56e70ee4ce16a075bd40ed6b2a609cc47
| * LfsConnectionFactoryTest: remove unnecessary castMatthias Sohn2024-10-102-2/+5
| | | | | | | | Change-Id: I08ed51b13aa269a4f6b64ac723b6bd7649c6591c
| * JSchSshProtocol2Test: remove unnecessary castMatthias Sohn2024-10-102-2/+3
| | | | | | | | Change-Id: Id3767f43cbbfd0c05f9a7f0d5620943da874df92
| * ApacheSshProtocol2Test: remove unnecessary castMatthias Sohn2024-10-102-2/+3
| | | | | | | | Change-Id: Ie8e7b097e48342a9cda6873e8595146a1b3f1427
| * NoteMapMerger: remove unnecessary castMatthias Sohn2024-10-101-1/+1
| | | | | | | | Change-Id: I3be4963f506529bbadc5b6dfc0b625ee85effc1f
* | 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
* | | | | | 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
* | | | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-13 13:36:47 +0000