summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Lower log-message for blocked email to INFOSven Selberg2024-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gerrit performing what the admin have configured it to do shouldn't be a WARNING. Release-Notes: skip Change-Id: Idbaf53f1c1ac0dbdef70dc849b90ed82cc0a1aef
* | | | | | Merge branch 'stable-3.7' into stable-3.8Daniele Sassoli2024-01-122-1/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.7: Make extra stop timeout configurable Release-Notes: skip Change-Id: I67377f8e6599149fc13d9bfac7ae9ecda04c3d00
| * | | | | Merge branch 'stable-3.6' into stable-3.7Daniele Sassoli2024-01-122-1/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.6: Make extra stop timeout configurable Release-Notes: skip Change-Id: Id18bd60589c04bf3b1924a6f8efdc3453aa1a50c
| | * | | | Merge branch 'stable-3.5' into stable-3.6Daniele Sassoli2024-01-122-1/+8
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.5: Make extra stop timeout configurable Release-Notes: skip Change-Id: I3aa276bc84bd11e858b13ea19ef8e2878145ab07
| | | * | | Make extra stop timeout configurableDaniele Sassoli2024-01-122-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we only wait 30 seconds on top of either httpd or sshd gracefulStopTimeout before terminating Gerrit, in some instances this might not be enough. Make it configurable so end user can decide what's best for their use case. Release-Notes: Introduce configurable shutdown timeout Change-Id: Ie976264792f683f8024f0b0266a3318f509f5cf5
* | | | | | Merge branch 'stable-3.7' into stable-3.8Luca Milanesio2024-01-127-7/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.7: Complete comment identity with the associated serverId in comments Doc: Fix broken link Fix typo in some tests Release-Notes: skip Change-Id: Idac24072b8aa64f2f5e90bc83336bbe066333c56
| * | | | | Complete comment identity with the associated serverId in commentsLuca Milanesio2024-01-113-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change note-db /meta ref contains the list of change notes associated, including all the comments were added to files and commit messages. The remapping of account-ids performed with I4b0fe6689 has correctly adapted the comment's author account-ids to the local associated accounts, however, it failed to update the comment serverId, leaving the rest of Gerrit with an inconsistent identity. Even though the identity was not causing apparent damage, mostly because the serverId was ignored mainly by Gerrit; it left the cached entities with the incorrect data and, in some cases, persisted back to NoteDb (see Issue 318745940). Rectify the situation by updating the serverId when accounts are remapped. Release-Notes: Fix serverId in identity parsing for imported human comments Forward-Compatible: checked Bug: Issue 318745940 Change-Id: I5904dc46120858beb54e20ac339f10a02d785d3a
| * | | | | Doc: Fix broken linkOrgad Shaneh2024-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Release-Notes: skip Change-Id: I44d4f734892baa3e76605f874c92c605d4b905b1
| * | | | | Fix typo in some testsOrgad Shaneh2024-01-093-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Release-Notes: skip Change-Id: I9a5ec10350e574c96ffc2b8beb219d566a1326f5
* | | | | | Merge branch 'stable-3.7' into stable-3.8Luca Milanesio2023-12-233-0/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.7: Emit refUpdate event upon copy-approvals Revert "Enforce Java 11 source version with JDK17" Enforce Java 11 source version with JDK17 javadoc: Include the default jvm options Add ProjectHeadUpdatedEvent to EventTypes Release-Notes: skip Change-Id: I698ea8e27fdc3d1c4ef57da5cb3d5c8cb2e7b4f2
| * | | | | Merge branch 'stable-3.6' into stable-3.7Luca Milanesio2023-12-231-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.6: Emit refUpdate event upon copy-approvals Revert "Enforce Java 11 source version with JDK17" Enforce Java 11 source version with JDK17 javadoc: Include the default jvm options Release-Notes: skip Change-Id: I9c3b40cfdbb0092bf2a022cce1a1dce6d06d96f2
| | * | | | Merge "Merge branch 'stable-3.5' into stable-3.6" into stable-3.6Luca Milanesio2023-12-230-0/+0
| | |\ \ \ \
| | | * | | | Merge branch 'stable-3.5' into stable-3.6Luca Milanesio2023-12-220-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.5: Emit refUpdate event upon copy-approvals Release-Notes: skip Change-Id: I213a2974066780fcd17014cb4d38a398d339ea31
| | | | * | | Emit refUpdate event upon copy-approvalsAntonio Barone2023-12-222-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change I493b9d7ee0 refactored the copy-approvals code to make it multi-threaded and slice-based. In doing so, it replaced `BatchUpdate.execute()` calls with with low-level `BatchRefUpdate.execute()` calls, introducing a regression whereby `refUpdate` events were no longer emitted. Explicitly fire `refUpdate` events upon the successful copy-approval update of the change meta ref and introduce a test to ensure this behavior is kept. Release-Notes: skip Forward-Compatible: checked Change-Id: I21ac623bd0f1b4a493f7e7984a93bd20911cd3d8
| | * | | | | Merge "Revert "Enforce Java 11 source version with JDK17"" into stable-3.6Luca Milanesio2023-12-231-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Revert "Enforce Java 11 source version with JDK17"Nasser Grainawi2023-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6c3d618538e35e6ca28eadc80eb37c52167db963. Reason for revert: This breaks the jdk17 build using the correct toolchain. Change I3cef2772b2 attempted to fix it, but it was not successful and likely requires a solution in Bazel. Change-Id: I0238614963693f0ba34d3a63c8dc824004298b21 Release-Notes: skip
| | * | | | | Merge "Enforce Java 11 source version with JDK17" into stable-3.6Nasser Grainawi2023-12-141-1/+1
| | |\| | | |
| | | * | | | Enforce Java 11 source version with JDK17Nasser Grainawi2023-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The intent of Change Ib3b923db7bb9 was to produce artifacts with Java 17 bytecode, but maintain Java 11 source compatibility. Setting the source to 11 and the target to 17 is the correct way to achieve that. Release-Notes: skip Change-Id: I715f1b47598ff69f0673607a2962cadc3e615b73
| | * | | | | javadoc: Include the default jvm optionsNasser Grainawi2023-12-071-0/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary if you're on a host that must use JVM options to configure successful network access (proxies, internal CAs, etc). Until Change I3d810fcdf this wasn't necessary because the host JVM (and the relevant bazel options) were used. Change-Id: I019e58fe94bbd9e129a397dac16b6df79a519b74 Release-Notes: skip
| * | | | | Merge "Merge branch 'stable-3.6' into stable-3.7" into stable-3.7Álvaro Vilaplana García2023-12-117-21/+52
| |\ \ \ \ \
| * \ \ \ \ \ Merge "Add ProjectHeadUpdatedEvent to EventTypes" into stable-3.7Dariusz Łuksza2023-12-082-0/+16
| |\ \ \ \ \ \
| | * | | | | | Add ProjectHeadUpdatedEvent to EventTypesDariusz Luksza2023-12-022-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to successfully deserialize events, we need to explicitly register a type and class for `ProjectHeadUpdatedEvent` in `EventType`. Without this a `JsonParseExecption`: _Uknown event type: project-head-updated_ will be thrown. Release-Notes: Fix event parse exception when changing repository HEAD Change-Id: I078f87be730f67fca857f83b98a358ebbc6bccda
* | | | | | | | Merge branch 'stable-3.7' into stable-3.8Alvaro Vilaplana Garcia2023-12-088-22/+64
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.7: GroupCacheImpl: Fix timer to include the correct method Simplify running commit-msg tests Make the indexing operation fail upon StorageException(s) ConsistencyCheckerIT: Delete calls to index broken changes that fail silently RefAdvertisementIT: Don't call reindex that would fail silently Bazel: Fix dev-bazel docs Remove `copy-approvals` command reference from Gerrit commands H2CacheImpl: Log when disk cache pruning runs MergeUtil: Create an optimized canFastForwardOrMerge Release-Notes: skip Change-Id: Ic38721acc086278a5281a02e8d7e99493b6e16b8
| * | | | | | | Merge branch 'stable-3.6' into stable-3.7Alvaro Vilaplana Garcia2023-12-087-21/+52
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.6: GroupCacheImpl: Fix timer to include the correct method Make the indexing operation fail upon StorageException(s) ConsistencyCheckerIT: Delete calls to index broken changes that fail silently RefAdvertisementIT: Don't call reindex that would fail silently Bazel: Fix dev-bazel docs Remove `copy-approvals` command reference from Gerrit commands H2CacheImpl: Log when disk cache pruning runs MergeUtil: Create an optimized canFastForwardOrMerge Release-Notes: skip Change-Id: Icf4d17803277a54fc315c9827324cd9bc3c2202f
| | * | | | | Merge branch 'stable-3.5' into stable-3.6Alvaro Vilaplana Garcia2023-12-076-17/+52
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.5: GroupCacheImpl: Fix timer to include the correct method Make the indexing operation fail upon StorageException(s) ConsistencyCheckerIT: Delete calls to index broken changes that fail silently RefAdvertisementIT: Don't call reindex that would fail silently Bazel: Fix dev-bazel docs H2CacheImpl: Log when disk cache pruning runs MergeUtil: Create an optimized canFastForwardOrMerge Release-Notes: skip Change-Id: Ia568a9bae1a9aea84f4a60679a828771aa42afff
| | | * | | | Merge branch 'stable-3.4' into stable-3.5Alvaro Vilaplana Garcia2023-12-071-9/+7
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.4: Make the indexing operation fail upon StorageException(s) ConsistencyCheckerIT: Delete calls to index broken changes that fail silently RefAdvertisementIT: Don't call reindex that would fail silently Release-Notes: skip Change-Id: Ie96402babc84da9e63fda409cfec44f87ff37ba2
| | | | * \ \ \ Merge branch 'stable-3.3' into stable-3.4Alvaro Vilaplana Garcia2023-12-073-43/+9
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.3: Make the indexing operation fail upon StorageException(s) ConsistencyCheckerIT: Delete calls to index broken changes that fail silently RefAdvertisementIT: Don't call reindex that would fail silently Release-Notes: skip Change-Id: I775de4baa70920c515aa040ff2222ec8052dd366
| | | | | * \ \ \ Merge branch 'stable-3.2' into stable-3.3upstream/stable-3.3Alvaro Vilaplana Garcia2023-12-063-43/+9
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.2: Make the indexing operation fail upon StorageException(s) ConsistencyCheckerIT: Delete calls to index broken changes that fail silently RefAdvertisementIT: Don't call reindex that would fail silently Release-Notes: skip Change-Id: Iecdf1e4ce450c8fab5244338ce46e6e4d95bf959
| | | | | | * | | | Make the indexing operation fail upon StorageException(s)upstream/stable-3.2Luca Milanesio2023-12-021-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 270450 caused the blanking of the Lucene document upon reindexing if any field caused a StorageException. Whilst the overall intention was good, the implementation caused the Lucene index replace operation to continue with a Document without any fields instead of making the whole operation fail. StorageExceptions are thrown when the underlying storage, being a filesystem or anything else, returns some errors. Whether the failure is permanent or temporary (e.g. concurrent GCs, repacking or pruning may cause sporadic StorageException(s)) returning a blank Lucene document was incorrect because, instead of failing the operation, it was causing the change entry to be completely removed from the index. Let the StorageException fail the indexing operation, so that existing entries may continue to exist, allowing the caller to retry the operation. The previous implementation, returning an empty Document, did not allow any retry, because once the change entry was removed from the index, it could not be discovered and reindexed anymore for example by a `gerrit index changes <changenum>`. Tested manually, applying a randomic StorageException thrown during the fetching of the ChangeField extensions: public static Set<String> getExtensions(ChangeData cd) { if (new Random().nextBoolean()) { throw new StorageException("Simulated storage exception"); } return extensions(cd).collect(toSet()); } Before this change, every time one change indexing throws a StorageException, it disappears from the index. Eventually, all changes will be eliminated and only an off-line reindex or the reindex of all changes in the project would allow to recover them. After this change, some of the indexing operations are successful and other fails. However, retrying the reindexing operation would allow to reindex all of them. Even if the above test case looks strange at first sight, it simulates a real-life scenario where a low percentage of indexing operation (0.1%) may fail because of sporadic StorageExceptions. Before this change, some index entries were missing on a daily basis (5 to 10 changes per day), whilst after this change all indexing operation can be retried and do not result in any indexing entry loss. Bug: Issue 314113030 Release-Notes: Fail the change reindex operation upon StorageException(s) Change-Id: Ia121f47f7a68c290849a22dea657804743a26b0d
| | | | | | * | | | ConsistencyCheckerIT: Delete calls to index broken changes that fail silentlyPatrick Hiesel2023-12-021-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These calls used to fail silently and are of no further use. This change is part of a series that allows for the fake change index to run in integration tests. The fake index throws an exception in case reindexing fails, which made this test fail. Release-Notes: skip Change-Id: I9c9d3f7613bca057bf0963442077bb6c0b3dab51
| | | | | | * | | | RefAdvertisementIT: Don't call reindex that would fail silentlyPatrick Hiesel2023-12-021-31/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | receivePackOmitsMissingObject wants to test a scenario where we have a change ref, but the patch set ref / commit was deleted or is otherwise gone. It did that by adding a new patch set pointing to a non-existent SHA1 and triggered a reindex of that change. However, that reindex fails silently because we submit the reindex task to another executor and provide no feedback to the caller. This commit modifies the test and just deletes the patch set ref which makes for the same scenario but without the reindex trouble. This change is part of a series that allows for the fake change index to run in integration tests. The fake index throws an exception in case reindexing fails, which made this test fail. Release-Notes: skip Change-Id: Icf79795a343a6abca28c6504b279eb0a5c84fad2
| | | * | | | | | | Merge "GroupCacheImpl: Fix timer to include the correct method" into stable-3.5Nasser Grainawi2023-12-041-3/+8
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | GroupCacheImpl: Fix timer to include the correct methodNasser Grainawi2023-12-041-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The timer block didn't include the call to the persisted cache despite the message of the timer indicating it did. Since the block that was previously included could have interesting timing information, keep it but provide a more accurate operation description. Change-Id: If038571f71f805cbb96294bb20a365e99104c136 Release-Notes: skip
| | | * | | | | | | | Merge "H2CacheImpl: Log when disk cache pruning runs" into stable-3.5Nasser Grainawi2023-12-042-1/+12
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | H2CacheImpl: Log when disk cache pruning runsNasser Grainawi2023-11-172-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can be helpful for admins to see when disk cache pruning is running and what work it's doing. Change-Id: I7802387b71f03029f246385080e4b976b7972359 Release-Notes: skip
| | | * | | | | | | | Bazel: Fix dev-bazel docsPrakash Aswal2023-11-291-1/+1
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build command for Java11 in dev-bazel docs to comply with default bazel version and .bazelrc Release-Notes: skip Change-Id: I86add69bfe995737d249d202d0392e35300d6d46
| | | * | | | | | | Merge "MergeUtil: Create an optimized canFastForwardOrMerge" into stable-3.5Nasser Grainawi2023-11-152-4/+25
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | MergeUtil: Create an optimized canFastForwardOrMergeNasser Grainawi2023-11-102-4/+25
| | | | | |_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method de-duplicates the potentially expensive hasMissingDependencies() call for callers that needed to do `canFastForward() || canMerge()`. Change-Id: If4b5a1244b79d84103af8939e621b503ba587cc3 Release-Notes: Improved performance for conflicts: operator and other mergability checks when submit type is Merge-If-Necessary
| | * | | | | | | | Remove `copy-approvals` command reference from Gerrit commandsJacek Centkowski2023-11-281-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `copy-approvals` was a `stable-3.5` version specific solution and it is no longer available in the newer versions of Gerrit. Therefore it shouldn't be mentioned on the command list with link that points to nowhere. Release-Notes: skip Change-Id: Id743018190867a672b034b026c9fc0808d046b67
| * | | | | | | | | Simplify running commit-msg testsOrgad Shaneh2023-12-041-1/+12
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Do not require TEST_TMPDIR. * Allow running from anywhere, not only from the project root. Release-Notes: skip Change-Id: I854c564641303753ffbae664681314d0a3759332
* | | | | | | | | MagicLabelPredicates.ignoresUploaderApprovals: Fix NPE when account is nullEdwin Kempin2023-11-272-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MagicLabelPredicates.ignoresUploaderApprovals fails with an NPE if account is null. * When MagicLabelPredicates.ignoresUploaderApprovals was added in change I4bd23d2f7 account was always set and never null. * Account can be null since change I0268476f0 which was done on a stable branch. * When that change was merged back by change I7c8af57e8 account could be null, but MagicLabelPredicates.ignoresUploaderApprovals was still expecting that account is always set. To fix this we check in MagicLabelPredicates.ignoresUploaderApprovals whether account is null and if yes, return false (if account is null it cannot match NON_UPLOADER_ACCOUNT_ID nor NON_CONTRIBUTOR_ACCOUNT_ID). Change I7c8af57e8 was submitted in February and hence is live since a long time now. It's unclear why we see this exceptiononly now and which exact conditions are triggering this, hence no test. Since we are here, annotate account with @Nullable so that it's less likely to miss that account can be null. Also update EqualsLabelPredicates which was changed similarly so that account can be null there too: * Annotate account with @Nullable so that it's less likely to miss that account can be null. * Check for account being null in isMagicUser() to avoid a possible NPE (at the moment this method is only called when account != null, so there is no actual problem with this right now). Release-Notes: Fixed NPE when submitting changes Change-Id: Iec3cbf29b4315a819e97ed3188e665fcdc651e1a Signed-off-by: Edwin Kempin <ekempin@google.com> Bug: Google b/293253546 (cherry picked from commit fc2cd072e1083ac7aab71ac6d0aeb40e2a145c94)
* | | | | | | | | Set version to 3.8.4-SNAPSHOTLuca Milanesio2023-11-245-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Release-Notes: skip Change-Id: I957d61bb1e25f1ca7ff0b5633d93ab15f2bd14b5
* | | | | | | | | Set version to 3.8.3v3.8.3v3.8.3-basedLuca Milanesio2023-11-245-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Release-Notes: skip Change-Id: I6bb24e7a9b01fa506dd9804b8f3273e847ee602e
* | | | | | | | | Merge branch 'stable-3.7' into stable-3.8Luca Milanesio2023-11-244-2/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.7: Set version to 3.7.7-SNAPSHOT Set version to 3.7.6 Set version to 3.6.9-SNAPSHOT Set version to 3.6.8 Update jgit to 82e277c81339 Fire `ref-updated` stream events on online edit refs update Fix documentation attributes bug Introduce Documentation:searchfree_safe with local-only fonts NOTE: The fix "Fire `ref-updated` stream events on online ..." has been reverted in this change because there is a similar fix on stable-3.8. The problem is captured in Issue 312949142. Release-Notes: skip Change-Id: I034f4cd31940d601acbcc750782a9047b183ffa8
| * | | | | | | | Set version to 3.7.7-SNAPSHOTLuca Milanesio2023-11-245-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Release-Notes: skip Change-Id: I0ef642fd986de6a7d4c7bcaf3203c837ee597243
| * | | | | | | | Set version to 3.7.6v3.7.6Luca Milanesio2023-11-245-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Release-Notes: skip Change-Id: I57b1214d366e26411c5ad7cf63e7611cd8ac15bc
| * | | | | | | | Merge branch 'stable-3.6' into stable-3.7Luca Milanesio2023-11-245-6/+49
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.6: Set version to 3.6.9-SNAPSHOT Set version to 3.6.8 Update jgit to 82e277c81339 Fire `ref-updated` stream events on online edit refs update Fix documentation attributes bug Introduce Documentation:searchfree_safe with local-only fonts Release-Notes: skip Change-Id: I3f65ae41849ff6f0fae09199eea3122cfd02155a
| | * | | | | | | Set version to 3.6.9-SNAPSHOTLuca Milanesio2023-11-235-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Release-Notes: skip Change-Id: I18fe7e4e606fd08caa08990f7bca10751090fee0
| | * | | | | | | Set version to 3.6.8v3.6.8Luca Milanesio2023-11-235-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Release-Notes: skip Change-Id: I8e5bd26712eae0b5c71b13195ceee5fbf03b9f7f
| | * | | | | | | Update jgit to 82e277c81339Matthias Sohn2023-11-231-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $ git log --oneline --no-merges 5ae8d28faaf..82e277c81339 88ca88a32 Add verification in GcKeepFilesTest that bitmaps are generated 3a6eec9bb Express the explicit intention of creating bitmaps in GC ac8d7838f GC: prune all packfiles after the loosen phase dd92c1aa9 Prepare 5.13.3-SNAPSHOT builds 5aa8a7e27 JGit v5.13.2.202306221912-r f6928f573 Revert "RefDirectory: Throw exception if CAS of packed ref list fails" 9932f9b41 [bazel] Move ToolTestCase to src folder (6.2) 2fd050c56 GcConcurrentTest: @Ignore flaky testInterruptGc 2aaa56113 Fix CommitTemplateConfigTest 70bc5aad3 Fix after_open config and Snapshotting RefDir tests to work with bazel 61d4e3134 [bazel] Skip ConfigTest#testCommitTemplatePathInHomeDirecory f3a3a2e87 Demote severity of some error prone bug patterns to warnings 032eef5b1 Parse pull.rebase=preserve as alias for pull.rebase=merges 064691e90 UploadPack: Fix NPE when traversing a tag chain b9b90d1d3 Add missing since tag for SshBasicTestBase 4f662a26f Add missing since tag for SshTestHarness#publicKey2 631858183 Silence API errors 96d9e3eb1 Prevent infinite loop rescanning the pack list on PackMismatchException f371bfb3e Remove blank in maven.config f73efea21 Remove blank in maven.config d3ba40c80 Ensure parsed RevCommitCG has derived data from commit-graph 17fac8a27 Downgrade maven-site-plugin to 3.12.1 fc613e26d Use wagon-ssh-external to deploy Maven site 23b9693a7 DirCache: support option index.skipHash Release-Notes: Update jgit to 82e277c81339 Change-Id: I2c74ddc810b7be0f6fff06e483c3e697c93696c9
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 23:13:06 +0000