]>
source.dussan.org Git - jgit.git/log
Nail Samatov [Fri, 21 Jan 2022 16:30:51 +0000 (19:30 +0300)]
LFS: Fix error occurring during delete branch
Fix TransportException occurring when deleting
a branch and push that change to remote repository
if BuiltinLFS is used to work with repository.
When finding LFS pointers in RemoteRepUpdate,
LfsPrePushHook fails to open ObjectReader
with new object id equal to ObjectId.zeroId().
If update is a deleting update (new object id is zero id),
we can assume that this update doesn't contain LFS Pointer
and we can skip step with extracting LFS pointer for that
RemoteRefUpdate.
Bug: 578313
Change-Id: Ic4367978338b8234d39d9af0d9674490f79fc22d
Signed-off-by: Nail Samatov <sanail@yandex.ru>
Ivan Frade [Thu, 27 Jan 2022 16:42:54 +0000 (11:42 -0500)]
Merge "PackOutputStream: Extract cancellation and digest to superclass"
kylezhao [Sat, 22 Jan 2022 08:54:20 +0000 (16:54 +0800)]
PackOutputStream: Extract cancellation and digest to superclass
Checking the cancelled status and keeping a digest of the written data
is useful for other output streams. e.g. to write commit-graphs.
Pull up that functionality to a superclass, so it can be reused.
Change-Id: I177b50be09c4ea631e7a144cc6127085ec2ca411
Signed-off-by: kylezhao <kylezhao@tencent.com>
David Ostrovsky [Sat, 22 Jan 2022 19:37:20 +0000 (20:37 +0100)]
Bazel: Include bazel resource configuration file for RBE build
In I988f61e34 tools/remote-bazelrc was added, but this resource file
wasn't imported from main resource file workspace/.bazelrc.
Change-Id: Ie0c2f128fbccaa6f9e99ad29a3a76ac294f3cd29
Ivan Frade [Fri, 21 Jan 2022 19:59:30 +0000 (14:59 -0500)]
Merge "DFS block cache: report index load and evict stats"
Alina Djamankulova [Wed, 29 Dec 2021 23:07:27 +0000 (15:07 -0800)]
DFS block cache: report index load and evict stats
Enhance cache performance monitoring for large data such as pack and
bitmap indexes. Provide details about what is loaded and evicted from
cache like total number of cache hits, time in cache before eviction.
Add a custom consumer to report loading events and eviction events when
enabled.
Signed-off-by: Alina Djamankulova <adjama@google.com>
Change-Id: I5739325db7ff7ec370e4defd8f7e46f1c3f5d2dd
David Ostrovsky [Wed, 19 Jan 2022 18:26:54 +0000 (19:26 +0100)]
Bazel: Add RBE support
The Bazel build can be used with Google's Remote Build Execution.
This needs the following setup steps:
$ gcloud auth application-default login
$ gcloud services enable remotebuildexecution.googleapis.com --project=${PROJECT}
Create a worker pool. The instances should have at least 4 CPUs each
for adequate performance.
$ gcloud alpha remote-build-execution worker-pools create default \
--project=${PROJECT} \
--instance=default_instance \
--worker-count=50 \
--machine-type=e2-standard-4 \
--disk-size=200
To use RBE, execute
$ bazel test --config=remote \
--remote_instance_name=projects/${PROJECT}/instances/default_instance \
//...
Change-Id: I988f61e342dab2136d8752ace945a4ed91a4189a
David Ostrovsky [Fri, 24 Dec 2021 06:43:48 +0000 (07:43 +0100)]
Bazel: Switch to using toolchain resolution for java rules
Bump Bazel version to release 5.0.0. In this new Bazel release,
--incompatible_use_toolchain_resolution_for_java_rules is flipped, that
means that the build must be adapted to toolchain resolution.
Specification toolchain resolution for java rules is here: [1]. Main
tracking Bazel issue is here: [2].
Given that new Bazel release also added support for remote JDK 17, add
experimental support for building with remote JDK 17 to produce major
byte code version 61.
Test Plan:
To build with remote JDK 11 run:
$ bazel build :all
To build with remote JDK 17 run:
$ bazel build --config java17 :all
[1] https://docs.google.com/document/d/1MVbBxbKVKRJJY7DnkptHpvz7ROhyAYy4a-TZ-n7Q0r4/edit?usp=sharing
[2] https://github.com/bazelbuild/bazel/issues/7849
Change-Id: I8d26dff722c6677ea7642913b61e416b23ea9041
David Ostrovsky [Mon, 10 Jan 2022 21:27:14 +0000 (22:27 +0100)]
Bazel: Simplify java 11 toolchain definition
Also remove unused JDK9_JVM_OPTS constant.
Change-Id: I0f45ca8312a2a8c3aee3855e3ef3afa95808b4ad
David Ostrovsky [Mon, 10 Jan 2022 21:07:09 +0000 (22:07 +0100)]
Bazel: Format build files with buildifier
Change-Id: I1ff38237058d11a3f61acc881c504382ff4b7e08
David Ostrovsky [Mon, 10 Jan 2022 20:58:26 +0000 (21:58 +0100)]
Bazel: Remove JDK 15 toolchain definition
Java 15 is outdated and the recent Bazel releases added support to
JDK 17.
Change-Id: I68c1f5b5132d844f07bfefc22f81ecf0a19df910
David Ostrovsky [Mon, 10 Jan 2022 20:55:08 +0000 (21:55 +0100)]
Bazel: Remove version check
Recent Bazel releases perform Bazel version check, based on
.bazelversion file.
Change-Id: I92d5daaef8ecbd011517d314564c0f5492c8ea75
David Ostrovsky [Mon, 10 Jan 2022 20:18:24 +0000 (21:18 +0100)]
ExternalToolTest: Rename class name to usual name for test cases
Change-Id: I00e4a5e73f530b7ac671d09b9b447bb24d6419fa
David Ostrovsky [Mon, 10 Jan 2022 19:59:38 +0000 (20:59 +0100)]
Bazel: Add missing java packages to error_prone package group
Change-Id: I709a3cd2639e9209b2c92c700e04ab4c90ed0524
David Ostrovsky [Mon, 10 Jan 2022 19:56:24 +0000 (20:56 +0100)]
Adapt junit_tests invocation to removal of resource_jars attribute
In upcoming Bazel release 5.0 resource_jars attribute was removed: [1].
Replace resource_jars with runtime_deps as recommended in the release
notes.
[1] https://github.com/bazelbuild/bazel/issues/13221
Change-Id: Iab834d647cf63259ca182adc1f862b6001db0cce
Matthias Sohn [Tue, 11 Jan 2022 23:19:56 +0000 (00:19 +0100)]
Update orbit to I20220111151929
and update
- com.google.gson to 2.8.9.v20220111-1409
- org.bouncycastle.bcpg to 1.70.0.v20220105-1522
- org.bouncycastle.bcpkix to 1.70.0.v20220105-1522
- org.bouncycastle.bcprov to 1.70.0.v20220105-1522
- org.bouncycastle.bcutil to 1.70.0.v20220105-1522
Change-Id: I7d9159e0e8524459a11da84cb2db709cb1f0823d
Matthias Sohn [Wed, 12 Jan 2022 13:02:23 +0000 (14:02 +0100)]
Update org.apache.maven.wagon:wagon-ssh to 3.5.1
Change-Id: I90807ef1ae065a8a8559e445c0aa7e2abdd2b9a8
Matthias Sohn [Tue, 11 Jan 2022 15:41:26 +0000 (16:41 +0100)]
Update org.eclipse.jdt:ecj to 3.28.0
Change-Id: I7573d8cfd07038bca4a7ed9e122e5dcf666632f8
Matthias Sohn [Wed, 12 Jan 2022 13:04:51 +0000 (14:04 +0100)]
Update org.osgi:org.osgi.core to 6.0.0
Change-Id: If93e0e8769fcbb92befa1f159f48b0ac6b6f3d24
Matthias Sohn [Wed, 12 Jan 2022 00:53:34 +0000 (01:53 +0100)]
[errorprone] Fix implicit use of platform default charset
Change-Id: I42f893c4248d8b00bf4aaf59cd528c43940f99e2
Matthias Sohn [Wed, 12 Jan 2022 16:05:25 +0000 (17:05 +0100)]
[bazel] Fix build of ExternalDiffToolTest
Change-Id: Ida4721142f49c86aa3f05aeffc6ca0aef40939f9
Matthias Sohn [Tue, 11 Jan 2022 22:42:53 +0000 (23:42 +0100)]
Let org.eclipse.jgit.pgm use BooleanTriState
Change-Id: I575cd5e1ecd326514a8bb4c36a86a2dc71ba5457
Matthias Sohn [Wed, 19 Jan 2022 08:53:21 +0000 (09:53 +0100)]
Merge branch 'stable-6.0'
* stable-6.0:
[bazel] Skip ConfigTest#testCommitTemplatePathInHomeDirecory
[errorprone] Fix InfiniteRecursion error in RecordingLogger
[errorprone] Suppress Finally error in ObjectDownloadListener
[errorprone] Fix implicit use of default charset in FileBasedConfigTest
[errorprone] Suppress FutureReturnValueIgnored in FileRepository#autoGc
Change-Id: I08d58c8f3f04e3a920da43b5fb252b1654c2b33c
Matthias Sohn [Wed, 19 Jan 2022 08:50:59 +0000 (03:50 -0500)]
Merge changes I6a22f37f,I092389e4,I20af1d8d,I83332efc into stable-6.0
* changes:
[bazel] Skip ConfigTest#testCommitTemplatePathInHomeDirecory
[errorprone] Fix InfiniteRecursion error in RecordingLogger
[errorprone] Suppress Finally error in ObjectDownloadListener
[errorprone] Fix implicit use of default charset in FileBasedConfigTest
Matthias Sohn [Wed, 19 Jan 2022 08:43:27 +0000 (03:43 -0500)]
Merge "[errorprone] Suppress FutureReturnValueIgnored in FileRepository#autoGc" into stable-6.0
Matthias Sohn [Tue, 18 Jan 2022 17:09:03 +0000 (18:09 +0100)]
Merge branch 'stable-6.0'
* stable-6.0:
UploadPack v2 protocol: Stop negotiation for orphan refs
Complete update to servlet api 4.0.0
Change-Id: I55ab6e8fd4a76e4313e37b12f9fc5d5e4b84a681
Matthias Sohn [Tue, 18 Jan 2022 17:07:59 +0000 (18:07 +0100)]
Merge branch 'stable-5.13' into stable-6.0
* stable-5.13:
UploadPack v2 protocol: Stop negotiation for orphan refs
Change-Id: I6a9ed8338ffbf5363e48d640a2c4209e4e503549
Matthias Sohn [Tue, 18 Jan 2022 16:51:14 +0000 (17:51 +0100)]
Merge branch 'stable-5.12' into stable-5.13
* stable-5.12:
UploadPack v2 protocol: Stop negotiation for orphan refs
Change-Id: Ib43068c32d9cb8effe4b873396391dc3c9197a6e
Matthias Sohn [Tue, 18 Jan 2022 16:49:03 +0000 (17:49 +0100)]
Merge branch 'stable-5.11' into stable-5.12
* stable-5.11:
UploadPack v2 protocol: Stop negotiation for orphan refs
Change-Id: I5db432bd416cfa8d3dd295bdce63e31d5f160a8a
Matthias Sohn [Wed, 12 Jan 2022 22:45:34 +0000 (23:45 +0100)]
[bazel] Skip ConfigTest#testCommitTemplatePathInHomeDirecory
Move this test to another class and skip it when running tests with
bazel since the bazel test runner does not allow to create files in the
home directory.
FS#userHome retrieves the home directory on the first call and caches it
for subsequent calls to avoid overhead in case path translation is
required (currently on cygwin). This prevents that the test can mock the
home directory using MockSystemReader like SshTestHarness does.
Change-Id: I6a22f37f4a19eb4b4935509eae508a23e56db7aa
Matthias Sohn [Wed, 12 Jan 2022 01:00:41 +0000 (02:00 +0100)]
[errorprone] Fix InfiniteRecursion error in RecordingLogger
Change-Id: I092389e428232a4fe7613d846c288d285ae9102c
Matthias Sohn [Wed, 12 Jan 2022 16:45:26 +0000 (17:45 +0100)]
[errorprone] Suppress Finally error in ObjectDownloadListener
Change-Id: I20af1d8d931608e93fbc52e127f1b7bafd2f917c
Matthias Sohn [Wed, 12 Jan 2022 01:02:35 +0000 (02:02 +0100)]
[errorprone] Fix implicit use of default charset in FileBasedConfigTest
Change-Id: I83332efc498a5bce242915a1eec2346e6e1f58fd
Matthias Sohn [Wed, 12 Jan 2022 00:52:26 +0000 (01:52 +0100)]
[errorprone] Suppress FutureReturnValueIgnored in FileRepository#autoGc
Ignore the FutureReturnValueIgnored warning for the unused return value
of #gc.
Change-Id: I4e7a2f85d404962c01726f9a1d079fe4a6430a1b
Marcin Czech [Wed, 22 Dec 2021 16:42:36 +0000 (17:42 +0100)]
UploadPack v2 protocol: Stop negotiation for orphan refs
The fetch of a single orphan ref (for example Gerrit meta ref:
refs/changes/21/21/meta) did not stop the negotiation so client
had to advertise all refs. This impacts the fetch performance
on repositories with a large number of refs (for example on
Gerrit repository it takes 20 seconds to fetch meta ref
comparing to 1.2 second to fetch ref with parent).
To avoid this issue UploadPack, used on the server side,
now checks if all `want` refs have parents, if not this
means that client doesn't need any extra objects, hence
the server responds with `ready` and finishes the
negotiation phase.
Bug: 577937
Change-Id: Ia3001b400b415d5cf6aae45e72345ca08d3af058
Matthias Sohn [Wed, 12 Jan 2022 17:37:02 +0000 (18:37 +0100)]
Complete update to servlet api 4.0.0
Ibd0240cf7ad updated servlet-api to 4.0.0 only partially for the
osgi-based build in Eclipse.
Complete this by updating dependencies also in maven and bazel build.
Change-Id: Ic4c3eb78c538007ca2177f6109d415147e58eabe
Thomas Wolf [Tue, 30 Nov 2021 22:56:44 +0000 (23:56 +0100)]
Switch to Apache MINA sshd 2.8.0
Update version in root pom.xml, adapt code & manifests. Bump the
dependency in the bazel build.
Update Orbit to I20220105095044 to get Apache MINA sshd 2.8.0 and
regenerate all target platforms.
Bug: 577542
Change-Id: Iefc02ceda8a9b0683f49aa8059999a5486d1f322
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Thomas Wolf [Thu, 6 Jan 2022 19:05:00 +0000 (14:05 -0500)]
Merge changes Ia744cd4a,Id95350c7,I746b7fb7
* changes:
sshd: backport upstream fix for SSHD-1231
[releng] bump japicmp base version and configure sshd bundles
Merge branch 'stable-6.0'
Thomas Wolf [Thu, 6 Jan 2022 18:33:44 +0000 (19:33 +0100)]
sshd: backport upstream fix for SSHD-1231
SSHD-1231[1] may lead to exceptions when trying to authenticate first
with an RSA key that is rejected by the server. The upstream fix is a
one-liner but unfortunately didn't make it into Apache MINA sshd 2.8.0.
Incorporate the upstream fix in JGitPublicKeyAuthentication, and add
a test case for this.
[1] https://issues.apache.org/jira/browse/SSHD-1231
Bug: 577545
Change-Id: Ia744cd4aa569bccd937c855f3bb45c0116915bad
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Sebastian Schuberth [Thu, 6 Jan 2022 08:04:40 +0000 (09:04 +0100)]
Add myself to .mailmap
Signed-off-by: Sebastian Schuberth <sebastian.schuberth@bosch.io>
Change-Id: I46e7bccb6c0c1e4dc21450220279b0546723773e
Thomas Wolf [Mon, 27 Dec 2021 10:32:15 +0000 (11:32 +0100)]
[releng] bump japicmp base version and configure sshd bundles
Bump the japicmp base version to 6.0.0.
202111291000 -r and configure
the o.e.j.ssh.apache and o.e.j.ssh.apache.agent bundles to ignore
internal classes.
Change-Id: Id95350c73b9141e1583f9de5fb6ab2496c7407d9
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Thomas Wolf [Wed, 5 Jan 2022 14:59:54 +0000 (15:59 +0100)]
Merge branch 'stable-6.0'
* stable-6.0:
Use slf4j-simple instead of log4j for logging
Update orbit to R20211213173813
Change-Id: I746b7fb71571020ce49f7b50fd675c9864327719
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Thomas Wolf [Wed, 5 Jan 2022 13:54:39 +0000 (14:54 +0100)]
Merge branch 'stable-5.13' into stable-6.0
* stable-5.13:
Use slf4j-simple instead of log4j for logging
Update orbit to R20211213173813
Change-Id: I219ef3901c1d908b91bf9c8f00431b22686ff7a5
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Matthias Sohn [Thu, 16 Dec 2021 17:42:45 +0000 (18:42 +0100)]
Use slf4j-simple instead of log4j for logging
JGit uses slf4j-api as logging API.
The libraries
- org.eclipse.jgit.http.test
- org.eclipse.jgit.pgm
- org.eclipse.jgit.ssh.apache.test
- org.eclipse.jgit.test
used the outdated log4j 1.2.15 which is EOL since years.
Since both jgit command line and also the tests don't need sophisticated
logging features replace log4j with the much simpler slf4j-simple log
implementation. The org.slf4j.binding.simple 1.7.30 archive has only
25kB instead of 429kB for log4j 1.2.15
Applications using jgit are free to choose any other log implementation
supporting slf4j API.
Change-Id: I89e85cd3c76e954c3434622510975ce65dc227d4
Matthias Sohn [Mon, 13 Dec 2021 23:07:10 +0000 (00:07 +0100)]
Update orbit to R20211213173813
and update
- com.google.gson to 2.8.8.v20211029-0838
- javaewah to 1.1.13.v20211029-0839
- net.i2p.crypto.eddsa to 0.3.0.v20210923-1401
- org.apache.ant to 1.10.12.v20211102-1452
- org.apache.commons.compress to 1.21.0.v20211103-2100
- org.bouncycastle.bcprov to 1.69.0.v20210923-1401
- org.junit to 4.13.2.v20211018-1956
Change-Id: I3ac39fc8a5df571d2e290241a03668f1e60880b4
Matthias Sohn [Thu, 30 Dec 2021 23:33:30 +0000 (00:33 +0100)]
Merge branch 'stable-6.0'
* stable-6.0:
Use FileSnapshot without using configs for FileBasedConfig
Change-Id: Icc38ce20c1c791c8cf0ca3dcab46b1151f122805
Matthias Sohn [Thu, 30 Dec 2021 23:30:51 +0000 (00:30 +0100)]
Merge branch 'stable-5.13' into stable-6.0
* stable-5.13:
Use FileSnapshot without using configs for FileBasedConfig
Change-Id: Iaff40b144aea9ad5e6d0fa6b448ad7d527992832
Matthias Sohn [Thu, 30 Dec 2021 23:29:40 +0000 (00:29 +0100)]
Merge branch 'stable-5.12' into stable-5.13
* stable-5.12:
Use FileSnapshot without using configs for FileBasedConfig
Change-Id: I6a0266cbcaaf18d0d60f0abecb5434fd919c44b7
Matthias Sohn [Thu, 30 Dec 2021 23:28:53 +0000 (00:28 +0100)]
Merge branch 'stable-5.11' into stable-5.12
* stable-5.11:
Use FileSnapshot without using configs for FileBasedConfig
Change-Id: I4e241860c2ca50750e22c2761c515c9895688c55
Matthias Sohn [Thu, 30 Dec 2021 23:26:24 +0000 (00:26 +0100)]
Merge branch 'stable-5.10' into stable-5.11
* stable-5.10:
Use FileSnapshot without using configs for FileBasedConfig
Change-Id: Ie3f2d05aeb1aa04af707cfafef5780349be4d981
Matthias Sohn [Thu, 30 Dec 2021 23:05:40 +0000 (00:05 +0100)]
Merge branch 'stable-5.9' into stable-5.10
* stable-5.9:
Use FileSnapshot without using configs for FileBasedConfig
Change-Id: I4f954c48ad6e8ff18826fdc72d225bff3e3ae2d9
Matthias Sohn [Thu, 30 Dec 2021 22:58:41 +0000 (23:58 +0100)]
Merge branch 'stable-5.8' into stable-5.9
* stable-5.8:
Use FileSnapshot without using configs for FileBasedConfig
Change-Id: Ic97d38fc85daa00297abbfa186f83b779966e7ef
Matthias Sohn [Thu, 30 Dec 2021 22:56:32 +0000 (23:56 +0100)]
Merge branch 'stable-5.7' into stable-5.8
* stable-5.7:
Use FileSnapshot without using configs for FileBasedConfig
Change-Id: If9cc2f2bae5dbead7a38218828da461540be942e
Matthias Sohn [Thu, 30 Dec 2021 22:53:54 +0000 (23:53 +0100)]
Merge branch 'stable-5.6' into stable-5.7
* stable-5.6:
Use FileSnapshot without using configs for FileBasedConfig
Change-Id: I274d46d73cc896dcfde6e24c69c71f33aaa78d20
Matthias Sohn [Thu, 30 Dec 2021 22:51:41 +0000 (23:51 +0100)]
Merge branch 'stable-5.5' into stable-5.6
* stable-5.5:
Use FileSnapshot without using configs for FileBasedConfig
Change-Id: If904289feecd1e0d8466c1fb998f160f14d54b61
Matthias Sohn [Thu, 30 Dec 2021 22:41:54 +0000 (23:41 +0100)]
Merge branch 'stable-5.4' into stable-5.5
* stable-5.4:
Use FileSnapshot without using configs for FileBasedConfig
Change-Id: I84e11bdaa9306e23212dac9d8670557a18d40107
Matthias Sohn [Thu, 30 Dec 2021 22:40:21 +0000 (23:40 +0100)]
Merge branch 'stable-5.3' into stable-5.4
* stable-5.3:
Use FileSnapshot without using configs for FileBasedConfig
Change-Id: I3d8eb2fa721e1a791db47a2342acc690ced01715
Matthias Sohn [Thu, 30 Dec 2021 22:33:06 +0000 (23:33 +0100)]
Merge branch 'stable-5.2' into stable-5.3
* stable-5.2:
Use FileSnapshot without using configs for FileBasedConfig
Change-Id: Ib79c310c5b632e845ba69ce65e739ae0146103ca
Matthias Sohn [Thu, 30 Dec 2021 22:18:21 +0000 (23:18 +0100)]
Merge branch 'stable-5.1' into stable-5.2
* stable-5.1:
Use FileSnapshot without using configs for FileBasedConfig
Change-Id: I17ede8876a0cf231c38cb9652c7bf51553b1e90e
Luca Milanesio [Tue, 28 Dec 2021 23:53:35 +0000 (23:53 +0000)]
Use FileSnapshot without using configs for FileBasedConfig
FileBasedConfig should not rely on auto-detection of
the file-snapshot attribute computation based on config.
The check was already performed when a new FileBasedConfig
is created at L158:
// don't use config in this snapshot to avoid endless recursion
newSnapshot = FileSnapshot.saveNoConfig(getFile());
The check was missing though when the FileBasedConfig is saved
to disk and the new snapshot is obtained from the associated
LockFile.
This change fixes the issue by keeping a non-config based
FileSnapshot also after a FileBasedConfig is saved.
Bug: 577983
Change-Id: Id1e410ba687e683ff2b2643af31e1110b103b356
Thomas Wolf [Sun, 26 Dec 2021 15:05:17 +0000 (16:05 +0100)]
Merge branch 'stable-6.0'
* stable-6.0:
Revert "RefDirectory.scanRef: Re-use file existence check done in snapshot creation"
TreeRevFilter: fix wrong stop when the given path disappears
Change-Id: Id7540d03991cdcf6f405e946b8cbbcc6a9696a31
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Thomas Wolf [Sun, 26 Dec 2021 15:03:40 +0000 (16:03 +0100)]
Merge branch 'stable-5.13' into stable-6.0
* stable-5.13:
Revert "RefDirectory.scanRef: Re-use file existence check done in snapshot creation"
TreeRevFilter: fix wrong stop when the given path disappears
Change-Id: Ibd69e9d941ad9262b61dd0c4368e48cb82597a12
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Thomas Wolf [Sun, 26 Dec 2021 15:02:51 +0000 (16:02 +0100)]
Merge branch 'stable-5.12' into stable-5.13
* stable-5.12:
Revert "RefDirectory.scanRef: Re-use file existence check done in snapshot creation"
Change-Id: I6576872cc0f5dd452252fa6e4526086cdee65c28
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Thomas Wolf [Sun, 26 Dec 2021 15:02:06 +0000 (16:02 +0100)]
Merge branch 'stable-5.11' into stable-5.12
* stable-5.11:
Revert "RefDirectory.scanRef: Re-use file existence check done in snapshot creation"
Change-Id: Ib80336a42e22da729b9db1e573772504cc0a3e77
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Thomas Wolf [Sun, 26 Dec 2021 15:01:08 +0000 (16:01 +0100)]
Merge branch 'stable-5.10' into stable-5.11
* stable-5.10:
Revert "RefDirectory.scanRef: Re-use file existence check done in snapshot creation"
Change-Id: I9e79ea2a0c554a184e4ce3b13e375eac8b7a4ac5
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Thomas Wolf [Sun, 26 Dec 2021 14:58:49 +0000 (15:58 +0100)]
Merge branch 'stable-5.9' into stable-5.10
* stable-5.9:
Revert "RefDirectory.scanRef: Re-use file existence check done in snapshot creation"
Change-Id: I2a84c838a886d1d6383c34f50b418baa743c57b0
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Thomas Wolf [Sun, 26 Dec 2021 14:57:59 +0000 (15:57 +0100)]
Merge branch 'stable-5.8' into stable-5.9
* stable-5.8:
Revert "RefDirectory.scanRef: Re-use file existence check done in snapshot creation"
Change-Id: I88a629e571fec5a9820114ebf5765b5d94a276bd
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Thomas Wolf [Sun, 26 Dec 2021 14:56:59 +0000 (15:56 +0100)]
Merge branch 'stable-5.7' into stable-5.8
* stable-5.7:
Revert "RefDirectory.scanRef: Re-use file existence check done in snapshot creation"
Change-Id: Ied786ab5e3c0dd05f701705fce2d4ad85502c4d6
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Thomas Wolf [Sun, 26 Dec 2021 14:55:52 +0000 (15:55 +0100)]
Merge branch 'stable-5.6' into stable-5.7
* stable-5.6:
Revert "RefDirectory.scanRef: Re-use file existence check done in snapshot creation"
Change-Id: I454622dae6eb95aedbd858e3b12da72282d36673
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Thomas Wolf [Sun, 26 Dec 2021 14:54:37 +0000 (15:54 +0100)]
Merge branch 'stable-5.5' into stable-5.6
* stable-5.5:
Revert "RefDirectory.scanRef: Re-use file existence check done in snapshot creation"
Change-Id: I2622f1d384a88a556ba9d88f0d08a37af69e530c
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Thomas Wolf [Sun, 26 Dec 2021 14:53:38 +0000 (15:53 +0100)]
Merge branch 'stable-5.4' into stable-5.5
* stable-5.4:
Revert "RefDirectory.scanRef: Re-use file existence check done in snapshot creation"
Change-Id: Ia1665dd92ccc3811a6116f41421a05aca10fc6eb
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Thomas Wolf [Sun, 26 Dec 2021 14:52:23 +0000 (15:52 +0100)]
Merge branch 'stable-5.3' into stable-5.4
* stable-5.3:
Revert "RefDirectory.scanRef: Re-use file existence check done in snapshot creation"
Change-Id: I52a57a17abe60e30e3d7615f8cb4d0c5e6aebd9b
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Thomas Wolf [Sun, 26 Dec 2021 14:51:23 +0000 (15:51 +0100)]
Merge branch 'stable-5.2' into stable-5.3
* stable-5.2:
Revert "RefDirectory.scanRef: Re-use file existence check done in snapshot creation"
Change-Id: Id37f47a5ef2e3c8329eca30c171941f7e5606a85
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Thomas Wolf [Sun, 26 Dec 2021 14:49:06 +0000 (15:49 +0100)]
Merge branch 'stable-5.1' into stable-5.2
* stable-5.1:
Revert "RefDirectory.scanRef: Re-use file existence check done in snapshot creation"
Change-Id: I625667c2718ab31ae7df907c3dd6024a933913b8
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Thomas Wolf [Sun, 26 Dec 2021 14:35:30 +0000 (15:35 +0100)]
Revert "RefDirectory.scanRef: Re-use file existence check done in snapshot creation"
This reverts commit
f829f5f838e0f9c17373ea6cb3407976a8f395ff .
Using MISSING_FILEKEY as indicator for a non-existing file doesn't work
on Windows.
Bug: 577954
Change-Id: I92102a3d259f6cc0f367096a3213cfa794466817
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
kylezhao [Fri, 12 Nov 2021 06:34:46 +0000 (14:34 +0800)]
TreeRevFilter: fix wrong stop when the given path disappears
When chgs[i] == adds[i], it indicated that a commit added some files
that pList[i] did not have, but didn't mean pList[i] is "empty tree
root".
Follow the example below:
. .
└── src └── src
└── d1 ==> └── d1
└─ file1 ├─ file1
└── file2
c.parents[i] c
The variable chg[i] equals to variable add[i],
but commit c.parents[i] is not "empty tree root".
We should add an additional check for no paths matching the filter.
Bug: 577227
Change-Id: I834e9ddd0de86b108b280a1139519ea962913b38
Signed-off-by: kylezhao <kylezhao@tencent.com>
Ivan Frade [Mon, 13 Dec 2021 21:02:01 +0000 (16:02 -0500)]
Merge "PackBitmapIndexV1: support parallel loading of reverse index"
Andre Bossert [Sun, 19 Jan 2020 19:41:23 +0000 (20:41 +0100)]
Add config reader for user-defined difftools
see: http://git-scm.com/docs/git-difftool
* add config reader for user-defined difftools
* diff.tool
* diff.guitool
* difftool.prompt
* difftool.trustExitCode
* difftool.<tool>.path
* difftool.<tool>.cmd
* add pre-defined difftools
* implemented "git difftool --tool-help" to verify config reader and
pre-defined difftools
Bug: 356832
Change-Id: Idde8fddbef61f3378ee565c6321570b3962d0e1d
Signed-off-by: Andre Bossert <andre.bossert@siemens.com>
Signed-off-by: Simeon Andreev <simeon.danailov.andreev@gmail.com>
Alina Djamankulova [Sat, 20 Nov 2021 00:25:47 +0000 (16:25 -0800)]
PackBitmapIndexV1: support parallel loading of reverse index
Speed up bitmap creation by loading reverse index in parallel
to reading bitmap from storage. Latency changes from
(time_to_read_bitmap + time_to_load_reverse_index) to
max(time_to_read_bitmap, time_to_load_reverse_index).
Add new option to DfsReaderOptions to control parallel reverse index
loading. Static cached thread pool is added to PackBitmapIndexV1 for
reverse index loading, and when not in use consumes minimal resources.
Signed-off-by: Alina Djamankulova <adjama@google.com>
Change-Id: Ia37a1d739631d053e8bddb925ac8b0b81d22379e
Matthias Sohn [Sat, 4 Dec 2021 20:21:52 +0000 (21:21 +0100)]
Merge branch 'stable-6.0'
* stable-6.0:
Add missing @since tags
Add missing @since tag
Add missing @since tags
Remove unused import in ApacheSshTest
Update maven plugins
Ignore missing javadoc in test bundles
storage: file: De-duplicate File.exists()+File.isFile()
RefDirectory.scanRef: Re-use file existence check done in snapshot creation
FileSnapshot: Lazy load file store attributes cache
Update eclipse-jarsigner-plugin to 1.3.2
Fix p2 repository URLs
Change-Id: I694c011f322f9a19479ef67b9fc725371da7418f
Matthias Sohn [Sat, 4 Dec 2021 20:11:38 +0000 (21:11 +0100)]
Merge branch 'stable-5.13' into stable-6.0
* stable-5.13:
Add missing @since tags
Add missing @since tag
Add missing @since tags
Remove unused import in ApacheSshTest
Update maven plugins
Ignore missing javadoc in test bundles
storage: file: De-duplicate File.exists()+File.isFile()
RefDirectory.scanRef: Re-use file existence check done in snapshot creation
FileSnapshot: Lazy load file store attributes cache
Update eclipse-jarsigner-plugin to 1.3.2
Fix p2 repository URLs
Change-Id: Icea0a4dced9688392e7f2411b98df52aed2b9c8c
Matthias Sohn [Sat, 4 Dec 2021 19:58:31 +0000 (20:58 +0100)]
Merge branch 'stable-5.12' into stable-5.13
* stable-5.12:
Add missing @since tags
Add missing @since tag
Add missing @since tags
Remove unused import in ApacheSshTest
Update maven plugins
Ignore missing javadoc in test bundles
storage: file: De-duplicate File.exists()+File.isFile()
RefDirectory.scanRef: Re-use file existence check done in snapshot creation
FileSnapshot: Lazy load file store attributes cache
Update eclipse-jarsigner-plugin to 1.3.2
Fix p2 repository URLs
Change-Id: I9c85b3a774480c4f4b56ecdf5015916349a0ddc0
Matthias Sohn [Sat, 4 Dec 2021 19:41:39 +0000 (20:41 +0100)]
Merge branch 'stable-5.11' into stable-5.12
* stable-5.11:
Add missing @since tags
Add missing @since tag
Add missing @since tags
Remove unused import in ApacheSshTest
Update maven plugins
Ignore missing javadoc in test bundles
storage: file: De-duplicate File.exists()+File.isFile()
RefDirectory.scanRef: Re-use file existence check done in snapshot creation
FileSnapshot: Lazy load file store attributes cache
Update eclipse-jarsigner-plugin to 1.3.2
Fix p2 repository URLs
Change-Id: I72f39fbe82dd578d71aa2e3ceccebb39a25c4e00
Matthias Sohn [Sat, 4 Dec 2021 19:26:55 +0000 (20:26 +0100)]
Merge branch 'stable-5.10' into stable-5.11
* stable-5.10:
Add missing @since tags
Add missing @since tag
Add missing @since tags
Remove unused import in ApacheSshTest
Update maven plugins
Ignore missing javadoc in test bundles
storage: file: De-duplicate File.exists()+File.isFile()
RefDirectory.scanRef: Re-use file existence check done in snapshot creation
FileSnapshot: Lazy load file store attributes cache
Update eclipse-jarsigner-plugin to 1.3.2
Fix p2 repository URLs
Change-Id: I84c73e11381c31566a12033db94e9afdcef5b705
Matthias Sohn [Sat, 4 Dec 2021 18:29:56 +0000 (19:29 +0100)]
Merge branch 'stable-5.9' into stable-5.10
* stable-5.9:
Add missing @since tags
Add missing @since tag
Add missing @since tags
Remove unused import in ApacheSshTest
Update maven plugins
Ignore missing javadoc in test bundles
storage: file: De-duplicate File.exists()+File.isFile()
RefDirectory.scanRef: Re-use file existence check done in snapshot creation
FileSnapshot: Lazy load file store attributes cache
Update eclipse-jarsigner-plugin to 1.3.2
Fix p2 repository URLs
Change-Id: I971745b529ff903ea8bf9c3dbbc746fa09f41041
Matthias Sohn [Sat, 4 Dec 2021 18:14:56 +0000 (19:14 +0100)]
Merge branch 'stable-5.8' into stable-5.9
* stable-5.8:
Add missing @since tags
Add missing @since tag
Add missing @since tags
Remove unused import in ApacheSshTest
Update maven plugins
Ignore missing javadoc in test bundles
storage: file: De-duplicate File.exists()+File.isFile()
RefDirectory.scanRef: Re-use file existence check done in snapshot creation
FileSnapshot: Lazy load file store attributes cache
Update eclipse-jarsigner-plugin to 1.3.2
Fix p2 repository URLs
Change-Id: I5e7c204c0e4c428df6f3b27ba1fc06326983f27c
Matthias Sohn [Sat, 4 Dec 2021 17:45:20 +0000 (18:45 +0100)]
Merge branch 'stable-5.7' into stable-5.8
* stable-5.7:
Add missing @since tags
Add missing @since tag
Add missing @since tags
Remove unused import in ApacheSshTest
Update maven plugins
Ignore missing javadoc in test bundles
storage: file: De-duplicate File.exists()+File.isFile()
RefDirectory.scanRef: Re-use file existence check done in snapshot
creation
FileSnapshot: Lazy load file store attributes cache
Update eclipse-jarsigner-plugin to 1.3.2
Fix p2 repository URLs
Change-Id: Ibe46e8479b57a54591ad7bd3cc29bf4a5274e43d
Matthias Sohn [Sat, 4 Dec 2021 17:34:48 +0000 (18:34 +0100)]
Add missing @since tags
Change-Id: Iaeca1d6154c1383ebe27b723e8814e262328eb48
Matthias Sohn [Sat, 4 Dec 2021 17:12:11 +0000 (18:12 +0100)]
Merge branch 'stable-5.6' into stable-5.7
* stable-5.6:
Add missing @since tag
Add missing @since tags
Remove unused import in ApacheSshTest
Update maven plugins
Ignore missing javadoc in test bundles
storage: file: De-duplicate File.exists()+File.isFile()
RefDirectory.scanRef: Re-use file existence check done in snapshot creation
FileSnapshot: Lazy load file store attributes cache
Update eclipse-jarsigner-plugin to 1.3.2
Fix p2 repository URLs
Change-Id: I53e6cb4b3a34b32d964e486c1ff3d130eed6e406
Matthias Sohn [Sat, 4 Dec 2021 17:07:09 +0000 (18:07 +0100)]
Add missing @since tag
Change-Id: I665c860696b6981dfec87a60c4eb95060a02436f
Matthias Sohn [Sat, 4 Dec 2021 16:52:04 +0000 (17:52 +0100)]
Merge branch 'stable-5.5' into stable-5.6
* stable-5.5:
Add missing @since tags
Remove unused import in ApacheSshTest
Update maven plugins
Ignore missing javadoc in test bundles
storage: file: De-duplicate File.exists()+File.isFile()
RefDirectory.scanRef: Re-use file existence check done in snapshot creation
FileSnapshot: Lazy load file store attributes cache
Update eclipse-jarsigner-plugin to 1.3.2
Fix p2 repository URLs
Change-Id: I007e92c12fde8d765b75f103e9d530aa0834b7d7
Matthias Sohn [Sat, 4 Dec 2021 16:47:48 +0000 (17:47 +0100)]
Add missing @since tags
Change-Id: Id21e626201363dd3d0358bd709765e7fd07a0cbf
Matthias Sohn [Sat, 4 Dec 2021 08:48:19 +0000 (09:48 +0100)]
Merge branch 'stable-5.4' into stable-5.5
* stable-5.4:
Remove unused import in ApacheSshTest
Update maven plugins
Ignore missing javadoc in test bundles
storage: file: De-duplicate File.exists()+File.isFile()
RefDirectory.scanRef: Re-use file existence check done in snapshot creation
FileSnapshot: Lazy load file store attributes cache
Update eclipse-jarsigner-plugin to 1.3.2
Fix p2 repository URLs
Change-Id: I5ce55c6c152a59602fef9fb08c16dedf666444e2
Matthias Sohn [Sat, 4 Dec 2021 01:16:08 +0000 (02:16 +0100)]
Merge branch 'stable-5.3' into stable-5.4
* stable-5.3:
Remove unused import in ApacheSshTest
Update maven plugins
Ignore missing javadoc in test bundles
storage: file: De-duplicate File.exists()+File.isFile()
RefDirectory.scanRef: Re-use file existence check done in snapshot creation
FileSnapshot: Lazy load file store attributes cache
Update eclipse-jarsigner-plugin to 1.3.2
Fix p2 repository URLs
Change-Id: I0e80612c8ddb934466105312f9107e91d581de0b
Matthias Sohn [Sat, 4 Dec 2021 00:58:53 +0000 (01:58 +0100)]
Merge branch 'stable-5.2' into stable-5.3
* stable-5.2:
Remove unused import in ApacheSshTest
Update maven plugins
Ignore missing javadoc in test bundles
storage: file: De-duplicate File.exists()+File.isFile()
RefDirectory.scanRef: Re-use file existence check done in snapshot creation
FileSnapshot: Lazy load file store attributes cache
Update eclipse-jarsigner-plugin to 1.3.2
Fix p2 repository URLs
Change-Id: Id989365446cb55b9188e02e6e1f8cbc8ab71071c
Matthias Sohn [Sat, 4 Dec 2021 00:40:36 +0000 (01:40 +0100)]
Remove unused import in ApacheSshTest
Change-Id: I55ebddf232369389e717bbf8707f6e785de14bce
Matthias Sohn [Fri, 3 Dec 2021 23:43:05 +0000 (00:43 +0100)]
Merge branch 'stable-5.1' into stable-5.2
* stable-5.1:
Update maven plugins
Ignore missing javadoc in test bundles
storage: file: De-duplicate File.exists()+File.isFile()
RefDirectory.scanRef: Re-use file existence check done in snapshot creation
FileSnapshot: Lazy load file store attributes cache
Update eclipse-jarsigner-plugin to 1.3.2
Fix p2 repository URLs
Change-Id: If3ad2cfb6c341b0ff5c2120a5a1646f6368d86e7
Matthias Sohn [Fri, 3 Dec 2021 21:45:05 +0000 (22:45 +0100)]
Update maven plugins
- build-helper-maven-plugin to 3.2.0
- jacoco-maven-plugin to 0.8.7
- maven-antrun-plugin to 3.0.0
- maven-dependency-plugin to 3.2.0
- maven-enforcer-plugin to 3.0.0
- maven-jar-plugin to 3.2.0
- maven-javadoc-plugin to 3.3.1
- maven-jxr-plugin to 3.1.1
- maven-pmd-plugin to 3.15.0
- maven-project-info-reports-plugin to 3.1.2
- maven-resources-plugin to 3.2.0
- maven-shade-plugin to 3.2.4
- maven-site-plugin to 3.9.1
- maven-source-plugin to 3.2.1
- maven-surefire-plugin to 3.0.0-M5
- spotbugs-maven-plugin to 4.3.0
- tycho and tycho-extras to 1.7.0
Change-Id: I7738fbfd7db60ddbeb372efcb4c72c71112ac231
Matthias Sohn [Thu, 24 Jun 2021 21:13:51 +0000 (23:13 +0200)]
Ignore missing javadoc in test bundles
Change-Id: I83ed20823dc6b22ff48c2a554acb2f7d3b6067b7
(cherry picked from commit
12f39c26b09bc3ebf1dd0216f56c37c808a53034 )
Nasser Grainawi [Fri, 3 Dec 2021 17:05:53 +0000 (10:05 -0700)]
storage: file: De-duplicate File.exists()+File.isFile()
File.isFile() [1] checks if the file exists and is a normal file.
[1] https://docs.oracle.com/javase/8/docs/api/java/io/File.html#isFile--
Change-Id: I0a883f2482ecc5ac58b270351b416742b568eb68
Signed-off-by: Nasser Grainawi <quic_nasserg@quicinc.com>