aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | PersonIdent: Preserve the timezone when copying with new timeIvan Frade2024-11-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PersonIdent(PersonIdent,Date) constructor must create a copy with the same author/email/timezone but different time. When we changed the implementation to the new Instant/ZoneId version, we forgot to pass the timezone. This made fail some tests downstream. Pass the timezone when constructing the copy. Change-Id: Iaa979e6dbaa3c55d4c4d2040068ab8b03163cd4e
| * | | | PersonIdent: Revert @since of #getZoneIdIvan Frade2024-11-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In [1], the @since tag of #getZoneId was updated to 7.1 by mistake. The implementation of the method is different but the API hasn't changed. Revert the tag to 6.1, when the method was introduced. [1] https://gerrithub.io/c/eclipse-jgit/jgit/+/1204142/9/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java Change-Id: If71d763ac28d4ec02bfebb1e65f56227f44e027d
| * | | | Merge changes I3844bf1e,I05c759bdMatthias Sohn2024-11-202-43/+63
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: tests/BasicTest: Use java.time constructors for PersonIdent RawParseUtils test: Use java.time to create PersonIdents
| | * | | | tests/BasicTest: Use java.time constructors for PersonIdentIvan Frade2024-11-191-27/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop using the deprecated constructor with long/int for time/tz and use instead Instant/ZoneId. The code is still using the old constructor, but this verifies that we are creating identical instances. We will update the code later. Change-Id: I3844bf1e790e53e69a894cd697bddb31b755c2e6
| | * | | | RawParseUtils test: Use java.time to create PersonIdentsIvan Frade2024-11-191-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The constructor with long/int for time/tz is deprecated in favor of Instant/ZoneId. Update first the expectations in the tests to the new constructors, so we know we are creating the same PersonIdents than before. We update the code later, knowing there is no regression in e.g. format or precision. Change-Id: I05c759bdd4cf73b8afe79fae3c792f2f1300d1e6
| * | | | | Merge "Change default similarity score to 50(%) to match git's default"Matthias Sohn2024-11-201-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Change default similarity score to 50(%) to match git's defaultMatthias Sohn2024-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git uses a default similarity score of 50(%) for rename detection. Fix RenameDetector to use the same default score. See https://git-scm.com/docs/git-diff#Documentation/git-diff.txt--Mltngt Bug: jgit-110 Change-Id: I4b75910a02bca1afc108ad9e5609fda1e49a29da
* | | | | | Merge branch 'stable-7.0' into stable-7.1Matthias Sohn2024-11-2111-14/+762
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-7.0: DiffDriver: fix doc for rust built-in DiffDriver: fix formatting of javadoc Add numberOfObjectsSinceBitmap to RepoStatistics Support built-in diff drivers for hunk header function names Don't fail when trying to prune pack which is already gone Rename numberOfPackFilesAfterBitmap to numberOfPackFilesSinceBitmap Change-Id: I3789de20ff5e1f52525c7d1b9ee22bc3b09f7f74
| * | | | | Merge branch 'stable-6.10' into stable-7.0Matthias Sohn2024-11-2113-192/+768
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.10: DiffDriver: fix doc for rust built-in DiffDriver: fix formatting of javadoc Add numberOfObjectsSinceBitmap to RepoStatistics Support built-in diff drivers for hunk header function names Don't fail when trying to prune pack which is already gone Rename numberOfPackFilesAfterBitmap to numberOfPackFilesSinceBitmap Change-Id: I7f18e96cc98c56ee7c5e6256fe9e83957e733aa8
| | * | | | DiffDriver: fix doc for rust built-inKaushik Lingarkar2024-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic430686dc41ecbd8d8d19068416bc18ba2d94f3f
| | * | | | 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
* | | | | Prepare 7.1.0-SNAPSHOT buildsMatthias Sohn2024-11-1989-123/+123
| | | | | | | | | | | | | | | | | | | | Change-Id: I69f57f933899b9926ab5124b24b90ae75f7a8d09
* | | | | JGit v7.1.0.202411191359-rc1v7.1.0.202411191359-rc1Matthias Sohn2024-11-1989-123/+123
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I802c3dbcbb05470aad6255cc05402647e704b446
* | | | | Merge branch 'master' into stable-7.1Matthias Sohn2024-11-1943-415/+1333
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: RecursiveMerger: fix boxing warning UploadPackTest: fix unclosed resource warning Suppress non-externalized string warnings Remove unused API problem filters PersonIdent: Use java.time instead of older Date and milliseconds GitTimeParser: A date parser using the java.time API Configure JDT to not raise error on deprecated class linked in javadoc Update Jetty to 12.0.15 PullCommandTest: assert git status in some simple tests SystemReader: add method to get LocalDateTime SystemReader#now: make it a concrete method [errorprone] RawText: Add parenthesis for explicit op precedence MockSystemReader: create the right time zone RawText: improve performance of isCrLfText and isBinary SystemReader: Give a default implementation to #getTimezoneAt() [errorprone] ssh: suppress warning for arrays in records Don't fail when trying to prune pack which is already gone Change-Id: I9161ba5dfa7ce4d0ba8ef44833124ecd414cb39d
| * | | | Merge "PullCommandTest: assert git status in some simple tests"Matthias Sohn2024-11-191-0/+7
| |\ \ \ \
| | * | | | PullCommandTest: assert git status in some simple testsMatthias Sohn2024-11-141-0/+7
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Bug: jgit-107 Change-Id: I54856849df7c6959ccc2b6f10de510950d3da401
| * | | | RecursiveMerger: fix boxing warningMatthias Sohn2024-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I6f6ae540b128ff6b965931e829da1368a8b88ddb
| * | | | UploadPackTest: fix unclosed resource warningMatthias Sohn2024-11-191-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I4efccd72bd567d42e739ee330e26c6b04d5c5c01
| * | | | Suppress non-externalized string warningsMatthias Sohn2024-11-194-14/+12
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib0737f7ec6b9872f6d4514d140e7d32a4a40809d
| * | | | Remove unused API problem filtersMatthias Sohn2024-11-191-53/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I8f5d2f6f1c6244f1b49fee713f7a06c0e9ec549b
| * | | | PersonIdent: Use java.time instead of older Date and millisecondsIvan Frade2024-11-192-44/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From errorprone: Date has a bad API that leads to bugs; prefer java.time.Instant or LocalDate. Replace the long with milliseconds and int with minutes offset with an Instant and a ZoneOffset. Create new constructors and deprecate variants with Date, milliseconds and minute offsets. When comparing instances of PersonIdent truncate the timestamp precision to 1 second since git commit timestamps are persisted with 1 second precision [1]. [1] https://git-scm.com/docs/git-commit#Documentation/git-commit.txt-Gitinternalformat Change-Id: Id4ba1f108e1ba0bfcdd87ba37c67e2d3cc7d254f
| * | | | GitTimeParser: A date parser using the java.time APIIvan Frade2024-11-194-0/+514
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replacement of GitDateParser that uses java.time classes instead of the obsolete Date. Updating GitDateParser would have been a mess of deprecation and methods with confusing names, so I opted for writing a parallel class with the new types. Some differences: * The new DateTimeFormatter is thread-safe, so we don't need the LocalThread cache * No code seems to use other locale than the default, we don't need to cache per locale either Change-Id: If24610a055a47702fb5b7be2fc35a7c722480ee3
| * | | | Configure JDT to not raise error on deprecated class linked in javadocMatthias Sohn2024-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I4f8cdaa3147c03b455ed0656622c6b69b474577a
| * | | | Merge "Update Jetty to 12.0.15"Matthias Sohn2024-11-1921-180/+180
| |\ \ \ \
| | * | | | Update Jetty to 12.0.15Matthias Sohn2024-11-1821-180/+180
| | |/ / / | | | | | | | | | | | | | | | Change-Id: I8414114bb6c38b62d912e55810b4bf68faf3083f
| * / / / SystemReader: add method to get LocalDateTimeIvan Frade2024-11-141-0/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Using #civilNow() because in the documentation, this calendar-based representation is called "civil time". Change-Id: Iaa363e66683cb548419666068a4ffef44a776e12
| * | | SystemReader#now: make it a concrete methodIvan Frade2024-11-142-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Abstract methods break subclasses (e.g. DelegateSystemReader in gerrit). Updating jgit and gerrit is simpler if we do not add them. I am not sure why some methods are abstract and others dont, but now() can be a concrete method. Make now() concrete. Implement it by default based on getCurrentTime(), so subclasses overriding that method get the same value. Change-Id: I697749f8cba698c5388ed13ebdc2b238d6259358
| * | | Merge "MockSystemReader: create the right time zone"Ivan Frade2024-11-141-1/+1
| |\ \ \
| | * | | MockSystemReader: create the right time zoneIvan Frade2024-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using this timezone in a later commit, it complains: Exception java.time.DateTimeException: Zone offset minutes and seconds must be negative because hours is negative Change-Id: I5787b51f98109942ac33e0496c5e3761914b2a78
| * | | | [errorprone] RawText: Add parenthesis for explicit op precedenceIvan Frade2024-11-131-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | errorprone reports: [OperatorPrecedence] Use grouping parenthesis to make the operator precedence explicit Take the chance to fix also https://errorprone.info/bugpattern/YodaCondition in the same lines. Change-Id: I6d8f00842ef2bb24cd00fc413121b8a4e20c186b
| * | | Merge "SystemReader: Give a default implementation to #getTimezoneAt()"Ivan Frade2024-11-132-11/+3
| |\ \ \
| | * | | SystemReader: Give a default implementation to #getTimezoneAt()Ivan Frade2024-11-132-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This abstract method forces subclasses (e.g. DelegateSystemReader in gerrit) to update their code, but there is no strong reason to make it abstract (subclasses can override it if needed). Make the method concrete using the current default implementation (which is the same in the mock). Change-Id: Id1df0d71cab1d86879adf48e782f0050d3abcfa9
| * | | | RawText: improve performance of isCrLfText and isBinaryXenoAmess2024-11-132-20/+483
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Inline the function isBinary(byte, byte), and reduce several duplicated checks in it, for better performance. Change-Id: Ida855ed4fd7456d8fb7ed68f3af2dbfa0e25897c
| * | | Merge "[errorprone] ssh: suppress warning for arrays in records"Ivan Frade2024-11-132-0/+2
| |\ \ \
| | * | | [errorprone] ssh: suppress warning for arrays in recordsIvan Frade2024-11-132-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Errorpone considers an error to have arrays (mutable) inside records (immutable) [1]. Suppress the warnings in these records, as they are overriding equals and hash to do the right thing. [1] https://errorprone.info/bugpattern/ArrayRecordComponent Change-Id: I01c724516b1b14d512d366a35708436463fccffc
| * | | | Merge branch 'stable-7.1'Matthias Sohn2024-11-130-0/+0
| |\ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | | | | * stable-7.1: Prepare 7.1.0-SNAPSHOT builds JGit v7.1.0.202411121450-m3 Change-Id: Ib507d052f37695f9e8235ef1711f4e8eaa113cd0
* | | | Prepare 7.1.0-SNAPSHOT buildsMatthias Sohn2024-11-1389-123/+123
| | | | | | | | | | | | | | | | Change-Id: Id5379361dd8673e91c998b56f2ee61e041da6113
* | | | JGit v7.1.0.202411121450-m3v7.1.0.202411121450-m3Matthias Sohn2024-11-1289-123/+123
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I5850cdc569eb5d13763f81e9b8332fe70207a4fd
* | | | Merge branch 'master' into stable-7.1Matthias Sohn2024-11-1273-2435/+977
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: errorprone: Disable javadoc checks in tests Rename numberOfPackFilesAfterBitmap to numberOfPackFilesSinceBitmap Replace custom encoder Constants#encodeASCII by JDK implementation Replace custom encoder `Constants#encode` by JDK implementation DfsGarbageCollector: #setReflogExpire with Instant instead of Date ssh: Minor simplification in SerialRangeSet DfsBlockCacheConfig: propagate hotmap configs to pack ext cache configs SystemReader: Offer methods with java.time API Add `numberOfPackFilesAfterBitmap` to RepoStatistics Enhance CommitBuilder#parent to tolerate null parent GPG: use BC PGP secret key parsing out of the box [errorprone] bc: Remove unused SExprParser#parseSecretKey Update bouncycastle to 1.79 Update bytebuddy to 1.15.10 DfsPackCompactor: write object size index [errorprone] BaseRepositoryBuilder: Use #split(sep, limit) [errorprone] Remove deprecated security manager [errorprone] RefDatabase: #getConflictingNames immutable return DfsGarbageCollector: Add setter for reflog expiration time. [errorprone] SeparateClassloadertTestRunner: use #split(String,int) [errorprone] HttpConnection: Add missing summary in java [errorprone] PackWriter: Fix javadoc tag in new #writeIndex method [errorprone] ByteArraySet: Add summary fragment to javadoc [errorprone] util.Stats: Add summary fragment to javadoc DfsInserter: Read minBytesForObjectSizeIndex only from repo config PackWriter: make PackWriter.writeIndex() take a PackIndexWriter dfs: update getBlockCacheStats to return a List of BlockCacheStats Update mockito to 5.14.2 Update bytebuddy to 1.15.7 Remove unnecessary argument handler in MergeBase.java Replace custom encoder Constants#encodeASCII by JDK implementation Change-Id: I0f84a69af152936f66bbcd2c8d9190ad159e7878
| | * | | Don't fail when trying to prune pack which is already goneJacek Centkowski2024-11-122-79/+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 prunePacked function is called in `TestRepository.packAndPrune` function after repo moves on after the GC was performed. Change-Id: I01b4ddbaddec1fdc24cfbb967e0edfe0de6c4b7c
| * | | Merge branch 'stable-7.0'Matthias Sohn2024-11-122-6/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-7.0: 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: I46f961144f2e3c4c57ef0f63a9c8954fee8133e9
| | * | 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)
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-23 02:17:02 +0000