| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| ... | |
| |\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* master:
blame.cache: Define interface and POJO to cache blame results
CgitMidxCompatibilityTest: remove unnecessary cast
Replace usage of deprecated Config#getEnum method
Update GetRefsBenchmark to use 3 state core.trustStat
URIish: fix stack overflow in regex matching
BlameGeneratorTest: Extract "file.txt" to a constant
MultiPackIndexWriter: add missing @since for new API class
DefaultTypedConfigGetter: Box values to avoid infinite recursion
midx.MultiPackIndexPrettyPrinter: pretty printer to debug multi pack index
midx.MultiPackIndexWriter: a writer for the multipack index format
test/tests.bzl: Add docstrings to module and function
[ssh known_hosts] Correct parsing of host key lines
Improve configuration of trusting file attributes in FileSnapshot
Config: add getters for primitive types without default value
CommitConfig: fix potential NPE
test.BUILD: add rule for "external tests"
midx.PackIndexMerger: Helper to iterate over n-indexes
PackIndex.MutableEntry: new methods to copy its contents
PackDirectory: make template variables names more readable
Log pruned packfiles as debug and not warn logs
LooseObjects: compute loose object path before retry loop
LooseObjects: convert while loop into for loop
Change-Id: Ia17db405d32f26f730c5206606c1ad3ff0ea28ee
|
| | | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | | |
Change-Id: I849d0a3ff07bb53e93112eb716a6537cf2419290
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
At the moment it supports only the write and print commands, and it is
subject to change (e.g. maybe paths are not handled correctly).
Example of usage, from the JGit directory:
$ bazel run //org.eclipse.jgit.pgm:jgit -- multi-pack-index \
print --midx $(pwd)/.git/objects/pack/multi-pack-index
or
$ bazel run //org.eclipse.jgit.pgm:jgit -- multi-pack-index \
write --midx ~/example.midx
Change-Id: Iac036eece9f119c2a23c9a20279888c0fabbb645
|
| | |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Blame goes into the history of a file until it blames all lines. If we
have a blamed version of the file in cache, we can use it to resolve
the lines not blamed yet and cut the calculation earlier.
When processing a candidate, check if it is in the cache and if so
fill the blame from the pending regions using the information of the
cached (and fully blamed) copy.
The generator doesn't populate the cache itself. Callers must take the
final results and put them in the cache.
Change-Id: Ia99b09d6d825e96940ca4200967958923bf647c7
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | | |
index"
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Prints the multipack index file in a human readable format. This helps
to debug/inspect multipack indexes generated by jgit or git.
Change-Id: I04f477b3763b0ecfde6f4379f267de8a609a54e7
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The blame generator goes into the history of a file until it blames
all lines. If the caller keeps a cache of the results, the generator
could use it to shorten that walk, using the blame information of an
older revision of the file to build the new blame view.
Define an interface and POJO for the blame cache.
Change-Id: Ib6b033ef46089bbc5a5b32e8e060d4ab0f74b871
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
which was introduced in I662982258bc4494f146805875e52838394673c8f.
In addition
- adjust inconsistent values for parameter numBranches to use
100, 1000, 10000, 100000 to cover 4 orders of magnitude
- reduce measurement time to 5 sec per round to limit overall time
needed to run the benchmark
Change-Id: I778b6b0a19354e26fa0b7733e322359ff0ce9466
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: I4ad43dfae8a0e9ac4db0e6f1dc88ac139d4fb853
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Need to make DirCacheVersions public otherwise Config#allValuesOf cannot
invoke its #values method via introspection.
Change-Id: Id11a6fdbe7ce3d84f04bf47e98746424dcc761b4
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The regex for a relative path used greedy matches, which could cause
excessive backtracking. Simplify the regex and use a possessive
quantifier to avoid backtracking at all: a relative path is a sequence
(AB)*A?, where A and B are disjunct: once (AB)* has been matched, there
is no need for any backtracking in the relative path.
Bug: egit-80
Change-Id: Ic7865f20767d85ec1db2d0b92adcd548099eb643
|
| | |\ \ \ \ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Use the correct parsing method to parse just a key type followed by the
base64-encoded key data. If we parse an AuthorizedKeyEntry, we may get
an exception if an unknown key type is listed.
Change-Id: I9e4e58410f1bb4e1af849d0586085052e04284d7
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Following change will add many tests, all using the same "file.txt"
and they read better with a constant.
Extract it now, so we have a clean change with only new tests without
modifying the old ones.
Change-Id: Ib5de86ce434358e8ce8c0514f76010dca31bdd6b
|
| | | |/ / / / / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
and fix boxing warnings.
Change-Id: Ia9b4deba7892256639c53bac5d7b62f1fbb01389
|
| | |\ \ \ \ \ \ \
| | |_|/ / / / /
| |/| | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Errorprone says:
DefaultTypedConfigGetter.java:176:
error: [InfiniteRecursion] This method always recurses, and will cause
a StackOverflowError return getLong(config, section,
subsection, name, defaultValue);
[1] introduced new getters with boxed types to return a null when the
config is not set. The getters of unboxed types should call to the
boxed version, but, as the values are not explicitely boxed, they
are calling to themselves.
[1] https://gerrithub.io/c/eclipse-jgit/jgit/+/1207895
Change-Id: Ied45a199c8ef905e3774a17a04d91a656aa0e42b
|
| | |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Fromg git documentation[1]: While the pack-indexes provide fast lookup
per packfile, this performance degrades as the number of packfiles
increases, because abbreviations need to inspect every packfile and we
are more likely to have a miss on our most-recently-used packfile. For
some large repositories, repacking into a single packfile is not
feasible due to storage space or excessive repack times. (...)
The multi-pack-index (MIDX for short) stores a list of objects and
their offsets into multiple packfiles. (...) Thus, we can provide
O(log N) lookup time for any number of packfiles.
This is a writer of the multipack index format. The test only verifies
the "shape" of the file, when we get a parser we can check also the
values (specially the large offset handling).
On the JGit repository, the multipack index generated by this writer
passes the validation of `git multi-pack-index verify`.
[1] https://git-scm.com/docs/pack-format#_multi_pack_index_midx_files_have_the_following_format
Change-Id: I1fca599c4ebf28154f28f039c2c4cfe75b2dc79d
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Downstream validators complain about these docstrings missing.
Change-Id: I01c1f40eccc7294a613a75d245a6ca03e14a47e1
|
| | |\ \ \ \ \ \
| | |/ / / / /
| |/| | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
In exttst/ (external tests?) we have tests that compare results
with cgit, but they are not in any bazel rule.
Create bazel rules for the tests under exttst/ with a tag "ext". By
default, disable that tag when running tests, as these can be
slow/problematic due to their dependence to an external tool.
bazel test //org.eclipse.jgit.test:all runs the same tests than before..
bazel test --test_tag_filter=ext //org.eclipse.jgit.test:all runs only
these external tests.
Change-Id: I9231fad11ab5ef550bba2d5aaaef60f1bf2094fe
|
| | |\ \ \ \ \ \
| | |_|/ / / /
| |/| | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
FileSnapshot relies on File attributes (which can be retrieved by the
stat() function on Unix) to quickly determine if a File was modified
without reading file content or listing content of a directory.
On NFS this doesn't work reliably due to NFS client caching behavior.
Hence we introduced the option core.trustFolderStat to control if
FileSnapshot can trust File attributes to ensure we don't miss
modifications on NFS. Later more specific options for handling packed
and loose refs were added which also support another config value
AFTER_OPEN, in addition to ALWAYS and NEVER, which refreshes File
attributes by opening a FileInputStream on the file instead of reading
its content and then trusts the File attributes of the refreshed File.
We discussed in jgit-127 how to extend these options for other scenarios
where file attributes are used to detect modifications and came to the
conclusion to improve the existing trustXXX config options in the
following way:
- replace the not well defined "trustFolderStat" option by a general
option "trustStat" which allows to configure all these scenarios with a
single option
- introduce a new enum TrustStat and use it for all scenarios. It has
the values
- NEVER don't trust File attributes
- ALWAYS always trust File attributes
- AFTER_OPEN open a FileInputStream on the respective file or folder
to ensure its File attributes are refreshed and then trust the
refreshed File attributes
- INHERIT only used for specific options to signal it should inherit
its value from the "trustStat" option
- deprecate the old, now unused enums "TrustPackedRefsStat" and
"TrustLooseRefStat"
- deprecate "trustFolderStat", if set, translate it to the corresponding
value of the new option "trustStat"
- if both "trustFolderStat" and "trustStat" are configured the value
configured for "trustStat" takes precedence and "trustFolderStat" is
ignored
- add one specific option for each scenario which can override the
global setting
- add new options "trustLooseObjectStat" and "trustPackStat" which allow
to override the global setting for handling of loose objects and pack
files
- implement option AFTER_OPEN for "trustLooseObjectStat" and
"trustPackStat"
Bug: jgit-127
Change-Id: I662982258bc4494f146805875e52838394673c8f
|
| | |\| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* changes:
Config: add getters for primitive types without default value
CommitConfig: fix potential NPE
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
which return null if the option is not configured.
Change-Id: I0d444b396458f49712e35ef32427dc45ee3f8ec8
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The local variable `comment` is null if the option core.commentChar is
unset.
Change-Id: I907dabff395f75b3a6367446389df395b28f027a
|
| | | |/ / / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The multipack index can be build merging the individual pack indexes
and handling correctly the duplicates.
PackIndexMerger is a utility function that gathers n-indexes and
allows to iterate as one with the correct sha1 order. It also
precalculates some of the needed metadata (as count of objects without
duplicates, or if offsets go over 32 bits).
Change-Id: I515b70fffff4489d83834488daf975f85726ea96
|
| | |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
To build the multipack index, we will iterate over N indexes merging
the results in sha1 order. With the current MutableEntry API, we need
to create an instance of ObjectId to either compare and/or copy the
selected entry to the multi index iterator.
Allow MutableEntries to compare to each other without creating any new
object, and copy their object id directly to another MutableObjectId.
This allows to build other iterators with mutable entries that copy
the required memory (few ints) instead of creating short-lived instances
of ObjectId.
Change-Id: I0c0091420d7c0847c03afdc9e73b566bb4eeba40
|
| | |\ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* stable-7.2:
RevWalk: Add an isMergedIntoAnyCommit() method
Prepare 7.2.0-SNAPSHOT builds
JGit v7.2.0.202501291320-m2
Pack: separate an open/close accounting lock
http.server/BUILD: expose servlet resources as target
Change-Id: I285979539d57f3a079ad7902ba82fe5d17de1069
|
| |\ \ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* stable-7.1:
RevWalk: Add an isMergedIntoAnyCommit() method
Pack: separate an open/close accounting lock
http.server/BUILD: expose servlet resources as target
Change-Id: Ie53048a5154a4a40f7c0f9da3b8b829d305ab323
|
| | |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* stable-7.0:
RevWalk: Add an isMergedIntoAnyCommit() method
Pack: separate an open/close accounting lock
http.server/BUILD: expose servlet resources as target
Change-Id: I25d3ffe86150d4d9e8a54634145cdbee34ea15fb
|
| | | |\ \ \
| | | | |/
| | | |/|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* stable-6.10:
RevWalk: Add an isMergedIntoAnyCommit() method
Pack: separate an open/close accounting lock
http.server/BUILD: expose servlet resources as target
Change-Id: Icda1b3dbc79c47d5dcc45932fe452fcf66e35657
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
RevWalk had a bulk isMergedIntoAny() method, however it worked only for
Refs. Add a similar method which works for RevCommits instead.
Unfortunately isMergedIntoAny() cannot be overloaded since java does not
include the generic types in Collections of method signatures, so the
method name needs to be more complicated to differentiate it from the
existing method.
Change-Id: I4f8f3a83058a186fafe3b37726e21c5074a6b8e1
Signed-off-by: Martin Fick <mfick@nvidia.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Previously the open/close accounting code used whole Pack object
synchronization for locking. Unfortunately, there are other unrelated
methods which use whole Pack object synchronization also, mostly to
avoid concurrent loading of these independent indices, and they do not
touch or need to coordinate with the open/close accounting data. During
heavy load when a new file appears after repacking the readFully()
threads could uselessly block on threads reading the reverse index.
These threads could have been reading from the Pack file instead of
waiting for the reverse index to be read. Use a new lock to make this
locking more fine grained to prevent the readFully() calling threads
from getting blocked in beginWindowCache() while the reverse index or
bitmaps are being loaded.
Change-Id: I7ac9067ca10cd6d6be0ab25148d99da3ace7ba36
Signed-off-by: Martin Fick <mfick@nvidia.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
JGit has moved to jakarta servlet-api, but gerrit is still in the
javax version. This is blocking gerrit to update their jgit
code. Gerrit can workaround this rebuilding the jar of jgit-servlet
but it is complicated to pass-through the resources.
Expose the resources of the servlet as a target, to help gerrit build
a javax version of the jgit-servlet.
Change-Id: Ifd794e4222ad442f4a538a4d38caa73d58be0f6d
(cherry picked from commit 31db36bbea6d081c8714a4c7ed3f5d81112ae8b8)
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: I646edcba7809ab91d8e0a933796b4b5c81736232
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Change-Id: I4e4e203c0f6a2463adefd28d3965eaf44bd2e620
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Follow-up of I57b24ffb0b3 addressing a readability issue on the
variable names of the PackDirectory.handlePackError() method.
Change-Id: I877a45328e9b7026e66f300c363ea5c1625af157
|
| | | | | |\ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
In the regular lifecycle of a Git repository, the packfiles
are constantly created and removed as part of repacking and pruning.
Lower the logging of disappearing packfiles to debug level
to reduce the SPAMing on logfile with warnings that should be
ignored as part of the normal repository life.
Change-Id: I57b24ffb0b32f7a64810cab47b5009f2bf89a6b8
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
It's unnecessary to recompute this for retries.
Change-Id: I383ecfa25d795ba177dd5ce14d12b318e38daf9b
|
| | |_|_|/ /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
to simplify the implementation and shorten variable names.
Change-Id: I84c038e65263b7d0c38c4e90817ab8b07ad5c2da
|
| |\ \ \ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Transitive dependency to org.apache.commons.lang3 was missing when
running tests in Eclipse.
Change-Id: I364fabc8b76f5401e400e1bf6dcb4fa400ee0494
|
| |\ \ \ \ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The custom code used earlier sometimes failed to cleanup files created
by tests. Hence replace it by using TemporaryFolder.
Change-Id: I8c1219b01835a4a6d20498ab04555af024e4e624
|
| | |_|_|_|_|/
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The current implementation throws an exception when a submodule is
updated for which the 'gitdir' still exists but the 'worktree' is
missing. The current implementation tries to clone the submodule but
fails as the 'gitdir' is not empty.
The commit adds:
- a check if the 'gitdir' is empty
- if the 'gitdir' is not empty:
- create a new '.git' file linking to the existing 'gitdir'
- fetch the submodule
- checkout the submodule unconditionally (ignore any configured
update mode)
- if the submodule is cloned checkout the submodule unconditionally
(ignore any configured update mode)
This change mimics the behavior of cgit.
Bug: jgit-79
Change-Id: Iffc8659d2a04d866a43815c78c7760c0f3d82640
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Not all SSH key types start with "ssh-" (for instance ECDSA keys).
Don't test for this; instead test that the string we want to use
as base64-encoded key starts with "AAAA".
Change-Id: Ia0e24d63c69c98813ac7419f4a688f3d15139a10
|
| |\ \ \ \ \ \ |
|
