 Support creating pack bitmap indexes in PackWriter.
Update the PackWriter to support writing out pack bitmap indexes,
a parallel ".bitmap" file to the ".pack" file.
Bitmaps are selected at commits every 1 to 5,000 commits for
each unique path from the start. The most recent 100 commits are
all bitmapped. The next 19,000 commits have a bitmaps every 100
commits. The remaining commits have a bitmap every 5,000 commits.
Commits with more than 1 parent are prefered over ones
with 1 or less. Furthermore, previously computed bitmaps are reused,
if the previous entry had the reuse flag set, which is set when the
bitmap was placed at the max allowed distance.
Bitmaps are used to speed up the counting phase when packing, for
requests that are not shallow. The PackWriterBitmapWalker uses
a RevFilter to proactively mark commits with RevFlag.SEEN, when
they appear in a bitmap. The walker produces the full closure
of reachable ObjectIds, given the collection of starting ObjectIds.
For fetch request, two ObjectWalks are executed to compute the
ObjectIds reachable from the haves and from the wants. The
ObjectIds needed to be written are determined by taking all the
resulting wants AND NOT the haves.
For clone requests, we get cached pack support for "free" since
it is possible to determine if all of the ObjectIds in a pack file
are included in the resulting list of ObjectIds to write.
On my machine, the best times for clones and fetches of the linux
kernel repository (with about 2.6M objects and 300K commits) are
tabulated below:
Operation Index V2 Index VE003
Clone 37530ms (524.06 MiB) 82ms (524.06 MiB)
Fetch (1 commit back) 75ms 107ms
Fetch (10 commits back) 456ms (269.51 KiB) 341ms (265.19 KiB)
Fetch (100 commits back) 449ms (269.91 KiB) 337ms (267.28 KiB)
Fetch (1000 commits back) 2229ms ( 14.75 MiB) 189ms ( 14.42 MiB)
Fetch (10000 commits back) 2177ms ( 16.30 MiB) 254ms ( 15.88 MiB)
Fetch (100000 commits back) 14340ms (185.83 MiB) 1655ms (189.39 MiB)
Change-Id: Icdb0cdd66ff168917fb9ef17b96093990cc6a98d
11 years ago  blame: Compute the origin of lines in a result file
BlameGenerator digs through history and discovers the origin of each
line of some result file. BlameResult consumes the stream of regions
created by the generator and lays them out in a table for applications
to display alongside of source lines.
Applications may optionally push in the working tree copy of a file
using the push(String, byte[]) method, allowing the application to
receive accurate line annotations for the working tree version. Lines
that are uncommitted (difference between HEAD and working tree) will
show up with the description given by the application as the author,
or "Not Committed Yet" as a default string.
Applications may also run the BlameGenerator in reverse mode using the
reverse(AnyObjectId, AnyObjectId) method instead of push(). When
running in the reverse mode the generator annotates lines by the
commit they are removed in, rather than the commit they were added in.
This allows a user to discover where a line disappeared from when they
are looking at an older revision in the repository. For example:
blame --reverse 16e810b2..master -L 1080, org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/RefDirectoryTest.java
( 1080) }
2302a6d3 (Christian Halstrick 2011-05-20 11:18:20 +0200 1081)
2302a6d3 (Christian Halstrick 2011-05-20 11:18:20 +0200 1082) /**
2302a6d3 (Christian Halstrick 2011-05-20 11:18:20 +0200 1083) * Kick the timestamp of a local file.
Above we learn that line 1080 (a closing curly brace of the prior
method) still exists in branch master, but the Javadoc comment below
it has been removed by Christian Halstrick on May 20th as part of
commit 2302a6d3. This result differs considerably from that of C
Git's blame --reverse feature. JGit tells the reader which commit
performed the delete, while C Git tells the reader the last commit
that still contained the line, leaving it an exercise to the reader
to discover the descendant that performed the removal.
This is still only a basic implementation. Quite notably it is
missing support for the smart block copy/move detection that the C
implementation of `git blame` is well known for. Despite being
incremental, the BlameGenerator can only be run once. After the
generator runs it cannot be reused. A better implementation would
support applications browsing through history efficiently.
In regards to CQ 5110, only a little of the original code survives.
CQ: 5110
Bug: 306161
Change-Id: I84b8ea4838bb7d25f4fcdd540547884704661b8f
Signed-off-by: Kevin Sawicki <kevin@github.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
13 years ago Support creating pack bitmap indexes in PackWriter.
Update the PackWriter to support writing out pack bitmap indexes,
a parallel ".bitmap" file to the ".pack" file.
Bitmaps are selected at commits every 1 to 5,000 commits for
each unique path from the start. The most recent 100 commits are
all bitmapped. The next 19,000 commits have a bitmaps every 100
commits. The remaining commits have a bitmap every 5,000 commits.
Commits with more than 1 parent are prefered over ones
with 1 or less. Furthermore, previously computed bitmaps are reused,
if the previous entry had the reuse flag set, which is set when the
bitmap was placed at the max allowed distance.
Bitmaps are used to speed up the counting phase when packing, for
requests that are not shallow. The PackWriterBitmapWalker uses
a RevFilter to proactively mark commits with RevFlag.SEEN, when
they appear in a bitmap. The walker produces the full closure
of reachable ObjectIds, given the collection of starting ObjectIds.
For fetch request, two ObjectWalks are executed to compute the
ObjectIds reachable from the haves and from the wants. The
ObjectIds needed to be written are determined by taking all the
resulting wants AND NOT the haves.
For clone requests, we get cached pack support for "free" since
it is possible to determine if all of the ObjectIds in a pack file
are included in the resulting list of ObjectIds to write.
On my machine, the best times for clones and fetches of the linux
kernel repository (with about 2.6M objects and 300K commits) are
tabulated below:
Operation Index V2 Index VE003
Clone 37530ms (524.06 MiB) 82ms (524.06 MiB)
Fetch (1 commit back) 75ms 107ms
Fetch (10 commits back) 456ms (269.51 KiB) 341ms (265.19 KiB)
Fetch (100 commits back) 449ms (269.91 KiB) 337ms (267.28 KiB)
Fetch (1000 commits back) 2229ms ( 14.75 MiB) 189ms ( 14.42 MiB)
Fetch (10000 commits back) 2177ms ( 16.30 MiB) 254ms ( 15.88 MiB)
Fetch (100000 commits back) 14340ms (185.83 MiB) 1655ms (189.39 MiB)
Change-Id: Icdb0cdd66ff168917fb9ef17b96093990cc6a98d
11 years ago PackWriter: Support reuse of entire packs
The most expensive part of packing a repository for transport to
another system is enumerating all of the objects in the repository.
Once this gets to the size of the linux-2.6 repository (1.8 million
objects), enumeration can take several CPU minutes and costs a lot
of temporary working set memory.
Teach PackWriter to efficiently reuse an existing "cached pack"
by answering a clone request with a thin pack followed by a larger
cached pack appended to the end. This requires the repository
owner to first construct the cached pack by hand, and record the
tip commits inside of $GIT_DIR/objects/info/cached-packs:
cd $GIT_DIR
root=$(git rev-parse master)
tmp=objects/.tmp-$$
names=$(echo $root | git pack-objects --keep-true-parents --revs $tmp)
for n in $names; do
chmod a-w $tmp-$n.pack $tmp-$n.idx
touch objects/pack/pack-$n.keep
mv $tmp-$n.pack objects/pack/pack-$n.pack
mv $tmp-$n.idx objects/pack/pack-$n.idx
done
(echo "+ $root";
for n in $names; do echo "P $n"; done;
echo) >>objects/info/cached-packs
git repack -a -d
When a clone request needs to include $root, the corresponding
cached pack will be copied as-is, rather than enumerating all of
the objects that are reachable from $root.
For a linux-2.6 kernel repository that should be about 376 MiB,
the above process creates two packs of 368 MiB and 38 MiB[1].
This is a local disk usage increase of ~26 MiB, due to reduced
delta compression between the large cached pack and the smaller
recent activity pack. The overhead is similar to 1 full copy of
the compressed project sources.
With this cached pack in hand, JGit daemon completes a clone request
in 1m17s less time, but a slightly larger data transfer (+2.39 MiB):
Before:
remote: Counting objects: 1861830, done
remote: Finding sources: 100% (1861830/1861830)
remote: Getting sizes: 100% (88243/88243)
remote: Compressing objects: 100% (88184/88184)
Receiving objects: 100% (1861830/1861830), 376.01 MiB | 19.01 MiB/s, done.
remote: Total 1861830 (delta 4706), reused 1851053 (delta 1553844)
Resolving deltas: 100% (1564621/1564621), done.
real 3m19.005s
After:
remote: Counting objects: 1601, done
remote: Counting objects: 1828460, done
remote: Finding sources: 100% (50475/50475)
remote: Getting sizes: 100% (18843/18843)
remote: Compressing objects: 100% (7585/7585)
remote: Total 1861830 (delta 2407), reused 1856197 (delta 37510)
Receiving objects: 100% (1861830/1861830), 378.40 MiB | 31.31 MiB/s, done.
Resolving deltas: 100% (1559477/1559477), done.
real 2m2.938s
Repository owners can periodically refresh their cached packs by
repacking their repository, folding all newer objects into a larger
cached pack. Since repacking is already considered to be a normal
Git maintenance activity, this isn't a very big burden.
[1] In this test $root was set back about two weeks.
Change-Id: Ib87131d5c4b5e8c5cacb0f4fe16ff4ece554734b
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years ago Added read/write support for pack bitmap index.
A pack bitmap index is an additional index of compressed
bitmaps of the object graph. Furthermore, a logical API of the index
functionality is included, as it is expected to be used by the
PackWriter.
Compressed bitmaps are created using the javaewah library, which is a
word-aligned compressed variant of the Java bitset class based on
run-length encoding. The library only works with positive integer
values. Thus, the maximum number of ObjectIds in a pack file that
this index can currently support is limited to Integer.MAX_VALUE.
Every ObjectId is given an integer mapping. The integer is the
position of the ObjectId in the complete ObjectId list, sorted
by offset, for the pack file. That integer is what the bitmaps
use to reference the ObjectId. Currently, the new index format can
only be used with pack files that contain a complete closure of the
object graph e.g. the result of a garbage collection.
The index file includes four bitmaps for the Git object types i.e.
commits, trees, blobs, and tags. In addition, a collection of
bitmaps keyed by an ObjectId is also included. The bitmap for each entry
in the collection represents the full closure of ObjectIds reachable
from the keyed ObjectId (including the keyed ObjectId itself). The
bitmaps are further compressed by XORing the current bitmaps against
prior bitmaps in the index, and selecting the smallest representation.
The XOR'd bitmap and offset from the current entry to the position
of the bitmap to XOR against is the actual representation of the entry
in the index file. Each entry contains one byte, which is currently
used to note whether the bitmap should be blindly reused.
Change-Id: Id328724bf6b4c8366a088233098c18643edcf40f
11 years ago Add method to read time unit from config
Time units supported:
-milliseconds (1 ms, 2 milliseconds)
-seconds (1 s, 1 sec, 1 second, 2 seconds)
-minutes (1 m, 1 min, 1 minute, 2 minutes)
-hours (1 h, 1 hr, 1 hour, 2 hours)
-days (1 d, 1 day, 2 days)
-weeks (1 w, 1 week, 2 weeks)
-months (1 mon, 1 month, 2 months)
-years (1 y, 1 year, 2 years)
This functionality is implemented in Gerrit ConfigUtil class. Add it to
JGit so it can eventually be remove from Gerrit.
Change-Id: I2d6564ff656b6ab9424a9360624061c94fd5f413
Signed-off-by: Hugo Arès <hugo.ares@ericsson.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> 8 years ago Added read/write support for pack bitmap index.
A pack bitmap index is an additional index of compressed
bitmaps of the object graph. Furthermore, a logical API of the index
functionality is included, as it is expected to be used by the
PackWriter.
Compressed bitmaps are created using the javaewah library, which is a
word-aligned compressed variant of the Java bitset class based on
run-length encoding. The library only works with positive integer
values. Thus, the maximum number of ObjectIds in a pack file that
this index can currently support is limited to Integer.MAX_VALUE.
Every ObjectId is given an integer mapping. The integer is the
position of the ObjectId in the complete ObjectId list, sorted
by offset, for the pack file. That integer is what the bitmaps
use to reference the ObjectId. Currently, the new index format can
only be used with pack files that contain a complete closure of the
object graph e.g. the result of a garbage collection.
The index file includes four bitmaps for the Git object types i.e.
commits, trees, blobs, and tags. In addition, a collection of
bitmaps keyed by an ObjectId is also included. The bitmap for each entry
in the collection represents the full closure of ObjectIds reachable
from the keyed ObjectId (including the keyed ObjectId itself). The
bitmaps are further compressed by XORing the current bitmaps against
prior bitmaps in the index, and selecting the smallest representation.
The XOR'd bitmap and offset from the current entry to the position
of the bitmap to XOR against is the actual representation of the entry
in the index file. Each entry contains one byte, which is currently
used to note whether the bitmap should be blindly reused.
Change-Id: Id328724bf6b4c8366a088233098c18643edcf40f
11 years ago  Handle stale file handles on packed-refs file
On a local filesystem the packed-refs file will be orphaned if it is
replaced by another client while the current client is reading the old
one. However, since NFS servers do not keep track of open files, instead
of orphaning the old packed-refs file, such a replacement will cause the
old file to be garbage collected instead. A stale file handle exception
will be raised on NFS servers if the file is garbage collected (deleted)
on the server while it is being read. Since we no longer have access to
the old file in these cases, the previous code would just fail. However,
in these cases, reopening the file and rereading it will succeed (since
it will reopen the new replacement file). So retrying the read is a
viable strategy to deal with stale file handles on the packed-refs file,
implement such a strategy.
Since it is possible that the packed-refs file could be replaced again
while rereading it (multiple consecutive updates can easily occur with
ref deletions), loop on stale file handle exceptions, up to 5 extra
times, trying to read the packed-refs file again, until we either read
the new file, or find that the file no longer exists. The limit of 5 is
arbitrary, and provides a safe upper bounds to prevent infinite loops
consuming resources in a potential unforeseen persistent error
condition.
Change-Id: I085c472bafa6e2f32f610a33ddc8368bb4ab1814
Signed-off-by: Martin Fick<mfick@codeaurora.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> 8 years ago  Rewrite push certificate parsing
- Consistently return structured data, such as actual ReceiveCommands,
which is more useful for callers that are doing things other than
verifying the signature, e.g. recording the set of commands.
- Store the certificate version field, as this is required to be part
of the signed payload.
- Add a toText() method to recreate the actual payload for signature
verification. This requires keeping track of the un-chomped command
strings from the original protocol stream.
- Separate the parser from the certificate itself, so the actual
PushCertificate object can be immutable. Make a fair attempt at deep
immutability, but this is not possible with the current mutable
ReceiveCommand structure.
- Use more detailed error messages that don't involve NON-NLS strings.
- Document null return values more thoroughly. Instead of having the
undocumented behavior of throwing NPE from certain methods if they
are not first guarded by enabled(), eliminate enabled() and return
null from those methods.
- Add tests for parsing a push cert from a section of pkt-line stream
using a real live stream captured with Wireshark (which, it should
be noted, uncovered several simply incorrect statements in C git's
Documentation/technical/pack-protocol.txt).
This is a slightly breaking API change to classes that were
technically public and technically released in 4.0. However, it is
highly unlikely that people were actually depending on public
behavior, since there were no public methods to create
PushCertificates with anything other than null field values, or a
PushCertificateParser that did anything other than infinite loop or
throw exceptions when reading.
Change-Id: I5382193347a8eb1811032d9b32af9651871372d0
9 years ago Implement similarity based rename detection
Content similarity based rename detection is performed only after
a linear time detection is performed using exact content match on
the ObjectIds. Any names which were paired up during that exact
match phase are excluded from the inexact similarity based rename,
which reduces the space that must be considered.
During rename detection two entries cannot be marked as a rename
if they are different types of files. This prevents a symlink from
being renamed to a regular file, even if their blob content appears
to be similar, or is identical.
Efficiently comparing two files is performed by building up two
hash indexes and hashing lines or short blocks from each file,
counting the number of bytes that each line or block represents.
Instead of using a standard java.util.HashMap, we use a custom
open hashing scheme similiar to what we use in ObjecIdSubclassMap.
This permits us to have a very light-weight hash, with very little
memory overhead per cell stored.
As we only need two ints per record in the map (line/block key and
number of bytes), we collapse them into a single long inside of
a long array, making very efficient use of available memory when
we create the index table. We only need object headers for the
index structure itself, and the index table, but not per-cell.
This offers a massive space savings over using java.util.HashMap.
The score calculation is done by approximating how many bytes are
the same between the two inputs (which for a delta would be how much
is copied from the base into the result). The score is derived by
dividing the approximate number of bytes in common into the length
of the larger of the two input files.
Right now the SimilarityIndex table should average about 1/2 full,
which means we waste about 50% of our memory on empty entries
after we are done indexing a file and sort the table's contents.
If memory becomes an issue we could discard the table and copy all
records over to a new array that is properly sized.
Building the index requires O(M + N log N) time, where M is the
size of the input file in bytes, and N is the number of unique
lines/blocks in the file. The N log N time constraint comes
from the sort of the index table that is necessary to perform
linear time matching against another SimilarityIndex created for
a different file.
To actually perform the rename detection, a SxD matrix is created,
placing the sources (aka deletions) along one dimension and the
destinations (aka additions) along the other. A simple O(S x D)
loop examines every cell in this matrix.
A SimilarityIndex is built along the row and reused for each
column compare along that row, avoiding the costly index rebuild
at the row level. A future improvement would be to load a smaller
square matrix into SimilarityIndexes and process everything in that
sub-matrix before discarding the column dimension and moving down
to the next sub-matrix block along that same grid of rows.
An optional ProgressMonitor is permitted to be passed in, allowing
applications to see the progress of the detector as it works through
the matrix cells. This provides some indication of current status
for very long running renames.
The default line/block hash function used by the SimilarityIndex
may not be optimal, and may produce too many collisions. It is
borrowed from RawText's hash, which is used to quickly skip out of
a longer equality test if two lines have different hash functions.
We may need to refine this hash in the future, in order to minimize
the number of collisions we get on common source files.
Based on a handful of test commits in JGit (especially my own
recent rename repository refactoring series), this rename detector
produces output that is very close to C Git. The content similarity
scores are sometimes off by 1%, which is most probably caused by
our SimilarityIndex type using a different hash function than C
Git uses when it computes the delta size between any two objects
in the rename matrix.
Bug: 318504
Change-Id: I11dff969e8a2e4cf252636d857d2113053bdd9dc
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
14 years ago Support creating pack bitmap indexes in PackWriter.
Update the PackWriter to support writing out pack bitmap indexes,
a parallel ".bitmap" file to the ".pack" file.
Bitmaps are selected at commits every 1 to 5,000 commits for
each unique path from the start. The most recent 100 commits are
all bitmapped. The next 19,000 commits have a bitmaps every 100
commits. The remaining commits have a bitmap every 5,000 commits.
Commits with more than 1 parent are prefered over ones
with 1 or less. Furthermore, previously computed bitmaps are reused,
if the previous entry had the reuse flag set, which is set when the
bitmap was placed at the max allowed distance.
Bitmaps are used to speed up the counting phase when packing, for
requests that are not shallow. The PackWriterBitmapWalker uses
a RevFilter to proactively mark commits with RevFlag.SEEN, when
they appear in a bitmap. The walker produces the full closure
of reachable ObjectIds, given the collection of starting ObjectIds.
For fetch request, two ObjectWalks are executed to compute the
ObjectIds reachable from the haves and from the wants. The
ObjectIds needed to be written are determined by taking all the
resulting wants AND NOT the haves.
For clone requests, we get cached pack support for "free" since
it is possible to determine if all of the ObjectIds in a pack file
are included in the resulting list of ObjectIds to write.
On my machine, the best times for clones and fetches of the linux
kernel repository (with about 2.6M objects and 300K commits) are
tabulated below:
Operation Index V2 Index VE003
Clone 37530ms (524.06 MiB) 82ms (524.06 MiB)
Fetch (1 commit back) 75ms 107ms
Fetch (10 commits back) 456ms (269.51 KiB) 341ms (265.19 KiB)
Fetch (100 commits back) 449ms (269.91 KiB) 337ms (267.28 KiB)
Fetch (1000 commits back) 2229ms ( 14.75 MiB) 189ms ( 14.42 MiB)
Fetch (10000 commits back) 2177ms ( 16.30 MiB) 254ms ( 15.88 MiB)
Fetch (100000 commits back) 14340ms (185.83 MiB) 1655ms (189.39 MiB)
Change-Id: Icdb0cdd66ff168917fb9ef17b96093990cc6a98d
11 years ago  Shallow fetch: Respect "shallow" lines
When fetching from a shallow clone, the client sends "have" lines
to tell the server about objects it already has and "shallow" lines
to tell where its local history terminates. In some circumstances,
the server fails to honor the shallow lines and fails to return
objects that the client needs.
UploadPack passes the "have" lines to PackWriter so PackWriter can
omit them from the generated pack. UploadPack processes "shallow"
lines by calling RevWalk.assumeShallow() with the set of shallow
commits. RevWalk creates and caches RevCommits for these shallow
commits, clearing out their parents. That way, walks correctly
terminate at the shallow commits instead of assuming the client has
history going back behind them. UploadPack converts its RevWalk to an
ObjectWalk, maintaining the cached RevCommits, and passes it to
PackWriter.
Unfortunately, to support shallow fetches the PackWriter does the
following:
if (shallowPack && !(walk instanceof DepthWalk.ObjectWalk))
walk = new DepthWalk.ObjectWalk(reader, depth);
That is, when the client sends a "deepen" line (fetch --depth=<n>)
and the caller has not passed in a DepthWalk.ObjectWalk, PackWriter
throws away the RevWalk that was passed in and makes a new one. The
cleared parent lists prepared by RevWalk.assumeShallow() are lost.
Fortunately UploadPack intends to pass in a DepthWalk.ObjectWalk.
It tries to create it by calling toObjectWalkWithSameObjects() on
a DepthWalk.RevWalk. But it doesn't work: because DepthWalk.RevWalk
does not override the standard RevWalk#toObjectWalkWithSameObjects
implementation, the result is a plain ObjectWalk instead of an
instance of DepthWalk.ObjectWalk.
The result is that the "shallow" information is thrown away and
objects reachable from the shallow commits can be omitted from the
pack sent when fetching with --depth from a shallow clone.
Multiple factors collude to limit the circumstances under which this
bug can be observed:
1. Commits with depth != 0 don't enter DepthGenerator's pending queue.
That means a "have" cannot have any effect on DepthGenerator unless
it is also a "want".
2. DepthGenerator#next() doesn't call carryFlagsImpl(), so the
uninteresting flag is not propagated to ancestors there even if a
"have" is also a "want".
3. JGit treats a depth of 1 as "1 past the wants".
Because of (2), the only place the UNINTERESTING flag can leak to a
shallow commit's parents is in the carryFlags() call from
markUninteresting(). carryFlags() only traverses commits that have
already been parsed: commits yet to be parsed are supposed to inherit
correct flags from their parent in PendingGenerator#next (which
doesn't happen here --- that is (2)). So the list of commits that have
already been parsed becomes relevant.
When we hit the markUninteresting() call, all "want"s, "have"s, and
commits to be unshallowed have been parsed. carryFlags() only
affects the parsed commits. If the "want" is a direct parent of a
"have", then it carryFlags() marks it as uninteresting. If the "have"
was also a "shallow", then its parent pointer should have been null
and the "want" shouldn't have been marked, so we see the bug. If the
"want" is a more distant ancestor then (2) keeps the uninteresting
state from propagating to the "want" and we don't see the bug. If the
"shallow" is not also a "have" then the shallow commit isn't parsed
so (2) keeps the uninteresting state from propagating to the "want
so we don't see the bug.
Here is a reproduction case (time flowing left to right, arrows
pointing to parents). "C" must be a commit that the client
reports as a "have" during negotiation. That can only happen if the
server reports it as an existing branch or tag in the first round of
negotiation:
A <-- B <-- C <-- D
First do
git clone --depth 1 <repo>
which yields D as a "have" and C as a "shallow" commit. Then try
git fetch --depth 1 <repo> B:refs/heads/B
Negotiation sets up: have D, shallow C, have C, want B.
But due to this bug B is marked as uninteresting and is not sent.
Change-Id: I6e14b57b2f85e52d28cdcf356df647870f475440
Signed-off-by: Terry Parker <tparker@google.com>
7 years ago Implement similarity based rename detection
Content similarity based rename detection is performed only after
a linear time detection is performed using exact content match on
the ObjectIds. Any names which were paired up during that exact
match phase are excluded from the inexact similarity based rename,
which reduces the space that must be considered.
During rename detection two entries cannot be marked as a rename
if they are different types of files. This prevents a symlink from
being renamed to a regular file, even if their blob content appears
to be similar, or is identical.
Efficiently comparing two files is performed by building up two
hash indexes and hashing lines or short blocks from each file,
counting the number of bytes that each line or block represents.
Instead of using a standard java.util.HashMap, we use a custom
open hashing scheme similiar to what we use in ObjecIdSubclassMap.
This permits us to have a very light-weight hash, with very little
memory overhead per cell stored.
As we only need two ints per record in the map (line/block key and
number of bytes), we collapse them into a single long inside of
a long array, making very efficient use of available memory when
we create the index table. We only need object headers for the
index structure itself, and the index table, but not per-cell.
This offers a massive space savings over using java.util.HashMap.
The score calculation is done by approximating how many bytes are
the same between the two inputs (which for a delta would be how much
is copied from the base into the result). The score is derived by
dividing the approximate number of bytes in common into the length
of the larger of the two input files.
Right now the SimilarityIndex table should average about 1/2 full,
which means we waste about 50% of our memory on empty entries
after we are done indexing a file and sort the table's contents.
If memory becomes an issue we could discard the table and copy all
records over to a new array that is properly sized.
Building the index requires O(M + N log N) time, where M is the
size of the input file in bytes, and N is the number of unique
lines/blocks in the file. The N log N time constraint comes
from the sort of the index table that is necessary to perform
linear time matching against another SimilarityIndex created for
a different file.
To actually perform the rename detection, a SxD matrix is created,
placing the sources (aka deletions) along one dimension and the
destinations (aka additions) along the other. A simple O(S x D)
loop examines every cell in this matrix.
A SimilarityIndex is built along the row and reused for each
column compare along that row, avoiding the costly index rebuild
at the row level. A future improvement would be to load a smaller
square matrix into SimilarityIndexes and process everything in that
sub-matrix before discarding the column dimension and moving down
to the next sub-matrix block along that same grid of rows.
An optional ProgressMonitor is permitted to be passed in, allowing
applications to see the progress of the detector as it works through
the matrix cells. This provides some indication of current status
for very long running renames.
The default line/block hash function used by the SimilarityIndex
may not be optimal, and may produce too many collisions. It is
borrowed from RawText's hash, which is used to quickly skip out of
a longer equality test if two lines have different hash functions.
We may need to refine this hash in the future, in order to minimize
the number of collisions we get on common source files.
Based on a handful of test commits in JGit (especially my own
recent rename repository refactoring series), this rename detector
produces output that is very close to C Git. The content similarity
scores are sometimes off by 1%, which is most probably caused by
our SimilarityIndex type using a different hash function than C
Git uses when it computes the delta size between any two objects
in the rename matrix.
Bug: 318504
Change-Id: I11dff969e8a2e4cf252636d857d2113053bdd9dc
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
14 years ago |
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765 |
- /*
- * Copyright (C) 2010, 2013 Sasa Zivkov <sasa.zivkov@sap.com>
- * Copyright (C) 2012, Research In Motion Limited
- * and other copyright owners as documented in the project's IP log.
- *
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Distribution License v1.0 which
- * accompanies this distribution, is reproduced below, and is
- * available at http://www.eclipse.org/org/documents/edl-v10.php
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- *
- * - Neither the name of the Eclipse Foundation, Inc. nor the
- * names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
- package org.eclipse.jgit.internal;
-
- import org.eclipse.jgit.nls.NLS;
- import org.eclipse.jgit.nls.TranslationBundle;
-
- /**
- * Translation bundle for JGit core
- */
- public class JGitText extends TranslationBundle {
-
- /**
- * @return an instance of this translation bundle
- */
- public static JGitText get() {
- return NLS.getBundleFor(JGitText.class);
- }
-
- // @formatter:off
- /***/ public String abbreviationLengthMustBeNonNegative;
- /***/ public String abortingRebase;
- /***/ public String abortingRebaseFailed;
- /***/ public String abortingRebaseFailedNoOrigHead;
- /***/ public String advertisementCameBefore;
- /***/ public String advertisementOfCameBefore;
- /***/ public String amazonS3ActionFailed;
- /***/ public String amazonS3ActionFailedGivingUp;
- /***/ public String ambiguousObjectAbbreviation;
- /***/ public String aNewObjectIdIsRequired;
- /***/ public String anExceptionOccurredWhileTryingToAddTheIdOfHEAD;
- /***/ public String anSSHSessionHasBeenAlreadyCreated;
- /***/ public String applyingCommit;
- /***/ public String archiveFormatAlreadyAbsent;
- /***/ public String archiveFormatAlreadyRegistered;
- /***/ public String argumentIsNotAValidCommentString;
- /***/ public String atLeastOnePathIsRequired;
- /***/ public String atLeastOnePatternIsRequired;
- /***/ public String atLeastTwoFiltersNeeded;
- /***/ public String atomicPushNotSupported;
- /***/ public String atomicRefUpdatesNotSupported;
- /***/ public String authenticationNotSupported;
- /***/ public String badBase64InputCharacterAt;
- /***/ public String badEntryDelimiter;
- /***/ public String badEntryName;
- /***/ public String badEscape;
- /***/ public String badGroupHeader;
- /***/ public String badObjectType;
- /***/ public String badRef;
- /***/ public String badSectionEntry;
- /***/ public String bareRepositoryNoWorkdirAndIndex;
- /***/ public String base64InputNotProperlyPadded;
- /***/ public String baseLengthIncorrect;
- /***/ public String bitmapMissingObject;
- /***/ public String bitmapsMustBePrepared;
- /***/ public String blameNotCommittedYet;
- /***/ public String blobNotFound;
- /***/ public String blobNotFoundForPath;
- /***/ public String blockSizeNotPowerOf2;
- /***/ public String branchNameInvalid;
- /***/ public String buildingBitmaps;
- /***/ public String cachedPacksPreventsIndexCreation;
- /***/ public String cachedPacksPreventsListingObjects;
- /***/ public String cannotBeCombined;
- /***/ public String cannotBeRecursiveWhenTreesAreIncluded;
- /***/ public String cannotChangeActionOnComment;
- /***/ public String cannotChangeToComment;
- /***/ public String cannotCheckoutFromUnbornBranch;
- /***/ public String cannotCheckoutOursSwitchBranch;
- /***/ public String cannotCombineSquashWithNoff;
- /***/ public String cannotCombineTreeFilterWithRevFilter;
- /***/ public String cannotCommitOnARepoWithState;
- /***/ public String cannotCommitWriteTo;
- /***/ public String cannotConnectPipes;
- /***/ public String cannotConvertScriptToText;
- /***/ public String cannotCreateConfig;
- /***/ public String cannotCreateDirectory;
- /***/ public String cannotCreateHEAD;
- /***/ public String cannotCreateIndexfile;
- /***/ public String cannotCreateTempDir;
- /***/ public String cannotDeleteCheckedOutBranch;
- /***/ public String cannotDeleteFile;
- /***/ public String cannotDeleteObjectsPath;
- /***/ public String cannotDeleteStaleTrackingRef;
- /***/ public String cannotDeleteStaleTrackingRef2;
- /***/ public String cannotDetermineProxyFor;
- /***/ public String cannotDownload;
- /***/ public String cannotEnterObjectsPath;
- /***/ public String cannotEnterPathFromParent;
- /***/ public String cannotExecute;
- /***/ public String cannotGet;
- /***/ public String cannotGetObjectsPath;
- /***/ public String cannotListObjectsPath;
- /***/ public String cannotListPackPath;
- /***/ public String cannotListRefs;
- /***/ public String cannotLock;
- /***/ public String cannotLockPackIn;
- /***/ public String cannotMatchOnEmptyString;
- /***/ public String cannotMkdirObjectPath;
- /***/ public String cannotMoveIndexTo;
- /***/ public String cannotMovePackTo;
- /***/ public String cannotOpenService;
- /***/ public String cannotParseDate;
- /***/ public String cannotParseGitURIish;
- /***/ public String cannotPullOnARepoWithState;
- /***/ public String cannotRead;
- /***/ public String cannotReadBlob;
- /***/ public String cannotReadCommit;
- /***/ public String cannotReadFile;
- /***/ public String cannotReadHEAD;
- /***/ public String cannotReadIndex;
- /***/ public String cannotReadObject;
- /***/ public String cannotReadObjectsPath;
- /***/ public String cannotReadTree;
- /***/ public String cannotRebaseWithoutCurrentHead;
- /***/ public String cannotResolveLocalTrackingRefForUpdating;
- /***/ public String cannotSquashFixupWithoutPreviousCommit;
- /***/ public String cannotStoreObjects;
- /***/ public String cannotResolveUniquelyAbbrevObjectId;
- /***/ public String cannotUnloadAModifiedTree;
- /***/ public String cannotUpdateUnbornBranch;
- /***/ public String cannotWorkWithOtherStagesThanZeroRightNow;
- /***/ public String cannotWriteObjectsPath;
- /***/ public String canOnlyCherryPickCommitsWithOneParent;
- /***/ public String canOnlyRevertCommitsWithOneParent;
- /***/ public String commitDoesNotHaveGivenParent;
- /***/ public String cantFindObjectInReversePackIndexForTheSpecifiedOffset;
- /***/ public String cantPassMeATree;
- /***/ public String channelMustBeInRange1_255;
- /***/ public String characterClassIsNotSupported;
- /***/ public String checkoutConflictWithFile;
- /***/ public String checkoutConflictWithFiles;
- /***/ public String checkoutUnexpectedResult;
- /***/ public String classCastNotA;
- /***/ public String cloneNonEmptyDirectory;
- /***/ public String closed;
- /***/ public String collisionOn;
- /***/ public String commandRejectedByHook;
- /***/ public String commandWasCalledInTheWrongState;
- /***/ public String commitAlreadyExists;
- /***/ public String commitMessageNotSpecified;
- /***/ public String commitOnRepoWithoutHEADCurrentlyNotSupported;
- /***/ public String commitAmendOnInitialNotPossible;
- /***/ public String compressingObjects;
- /***/ public String connectionFailed;
- /***/ public String connectionTimeOut;
- /***/ public String contextMustBeNonNegative;
- /***/ public String corruptionDetectedReReadingAt;
- /***/ public String corruptObjectBadDate;
- /***/ public String corruptObjectBadEmail;
- /***/ public String corruptObjectBadStream;
- /***/ public String corruptObjectBadStreamCorruptHeader;
- /***/ public String corruptObjectBadTimezone;
- /***/ public String corruptObjectDuplicateEntryNames;
- /***/ public String corruptObjectGarbageAfterSize;
- /***/ public String corruptObjectIncorrectLength;
- /***/ public String corruptObjectIncorrectSorting;
- /***/ public String corruptObjectInvalidEntryMode;
- /***/ public String corruptObjectInvalidMode;
- /***/ public String corruptObjectInvalidModeChar;
- /***/ public String corruptObjectInvalidModeStartsZero;
- /***/ public String corruptObjectInvalidMode2;
- /***/ public String corruptObjectInvalidMode3;
- /***/ public String corruptObjectInvalidName;
- /***/ public String corruptObjectInvalidNameAux;
- /***/ public String corruptObjectInvalidNameCon;
- /***/ public String corruptObjectInvalidNameCom;
- /***/ public String corruptObjectInvalidNameEnd;
- /***/ public String corruptObjectInvalidNameIgnorableUnicode;
- /***/ public String corruptObjectInvalidNameInvalidUtf8;
- /***/ public String corruptObjectInvalidNameLpt;
- /***/ public String corruptObjectInvalidNameNul;
- /***/ public String corruptObjectInvalidNamePrn;
- /***/ public String corruptObjectInvalidObject;
- /***/ public String corruptObjectInvalidParent;
- /***/ public String corruptObjectInvalidTree;
- /***/ public String corruptObjectInvalidType;
- /***/ public String corruptObjectInvalidType2;
- /***/ public String corruptObjectMalformedHeader;
- /***/ public String corruptObjectMissingEmail;
- /***/ public String corruptObjectNameContainsByte;
- /***/ public String corruptObjectNameContainsChar;
- /***/ public String corruptObjectNameContainsNullByte;
- /***/ public String corruptObjectNameContainsSlash;
- /***/ public String corruptObjectNameDot;
- /***/ public String corruptObjectNameDotDot;
- /***/ public String corruptObjectNameZeroLength;
- /***/ public String corruptObjectNegativeSize;
- /***/ public String corruptObjectNoAuthor;
- /***/ public String corruptObjectNoCommitter;
- /***/ public String corruptObjectNoHeader;
- /***/ public String corruptObjectNoObject;
- /***/ public String corruptObjectNoObjectHeader;
- /***/ public String corruptObjectNoTaggerBadHeader;
- /***/ public String corruptObjectNoTaggerHeader;
- /***/ public String corruptObjectNoTagHeader;
- /***/ public String corruptObjectNoTagName;
- /***/ public String corruptObjectNotree;
- /***/ public String corruptObjectNotreeHeader;
- /***/ public String corruptObjectNoType;
- /***/ public String corruptObjectNoTypeHeader;
- /***/ public String corruptObjectPackfileChecksumIncorrect;
- /***/ public String corruptObjectTruncatedInMode;
- /***/ public String corruptObjectTruncatedInName;
- /***/ public String corruptObjectTruncatedInObjectId;
- /***/ public String corruptObjectZeroId;
- /***/ public String corruptPack;
- /***/ public String corruptUseCnt;
- /***/ public String couldNotCheckOutBecauseOfConflicts;
- /***/ public String couldNotDeleteLockFileShouldNotHappen;
- /***/ public String couldNotDeleteTemporaryIndexFileShouldNotHappen;
- /***/ public String couldNotGetAdvertisedRef;
- /***/ public String couldNotGetRepoStatistics;
- /***/ public String couldNotLockHEAD;
- /***/ public String couldNotReadIndexInOneGo;
- /***/ public String couldNotReadObjectWhileParsingCommit;
- /***/ public String couldNotRenameDeleteOldIndex;
- /***/ public String couldNotRenameTemporaryFile;
- /***/ public String couldNotRenameTemporaryIndexFileToIndex;
- /***/ public String couldNotRewindToUpstreamCommit;
- /***/ public String couldNotURLEncodeToUTF8;
- /***/ public String couldNotWriteFile;
- /***/ public String countingObjects;
- /***/ public String createBranchFailedUnknownReason;
- /***/ public String createBranchUnexpectedResult;
- /***/ public String createNewFileFailed;
- /***/ public String credentialPassword;
- /***/ public String credentialUsername;
- /***/ public String daemonAlreadyRunning;
- /***/ public String daysAgo;
- /***/ public String deleteBranchUnexpectedResult;
- /***/ public String deleteFileFailed;
- /***/ public String deleteTagUnexpectedResult;
- /***/ public String deletingNotSupported;
- /***/ public String destinationIsNotAWildcard;
- /***/ public String detachedHeadDetected;
- /***/ public String dirCacheDoesNotHaveABackingFile;
- /***/ public String dirCacheFileIsNotLocked;
- /***/ public String dirCacheIsNotLocked;
- /***/ public String DIRCChecksumMismatch;
- /***/ public String DIRCExtensionIsTooLargeAt;
- /***/ public String DIRCExtensionNotSupportedByThisVersion;
- /***/ public String DIRCHasTooManyEntries;
- /***/ public String DIRCUnrecognizedExtendedFlags;
- /***/ public String dirtyFilesExist;
- /***/ public String doesNotHandleMode;
- /***/ public String downloadCancelled;
- /***/ public String downloadCancelledDuringIndexing;
- /***/ public String duplicateAdvertisementsOf;
- /***/ public String duplicateRef;
- /***/ public String duplicateRemoteRefUpdateIsIllegal;
- /***/ public String duplicateStagesNotAllowed;
- /***/ public String eitherGitDirOrWorkTreeRequired;
- /***/ public String emptyCommit;
- /***/ public String emptyPathNotPermitted;
- /***/ public String emptyRef;
- /***/ public String encryptionError;
- /***/ public String encryptionOnlyPBE;
- /***/ public String endOfFileInEscape;
- /***/ public String entryNotFoundByPath;
- /***/ public String enumValueNotSupported2;
- /***/ public String enumValueNotSupported3;
- /***/ public String enumValuesNotAvailable;
- /***/ public String errorDecodingFromFile;
- /***/ public String errorEncodingFromFile;
- /***/ public String errorInBase64CodeReadingStream;
- /***/ public String errorInPackedRefs;
- /***/ public String errorInvalidProtocolWantedOldNewRef;
- /***/ public String errorListing;
- /***/ public String errorOccurredDuringUnpackingOnTheRemoteEnd;
- /***/ public String errorReadingInfoRefs;
- /***/ public String exceptionCaughtDuringExecutionOfHook;
- /***/ public String exceptionCaughtDuringExecutionOfAddCommand;
- /***/ public String exceptionCaughtDuringExecutionOfArchiveCommand;
- /***/ public String exceptionCaughtDuringExecutionOfCherryPickCommand;
- /***/ public String exceptionCaughtDuringExecutionOfCommitCommand;
- /***/ public String exceptionCaughtDuringExecutionOfFetchCommand;
- /***/ public String exceptionCaughtDuringExecutionOfLsRemoteCommand;
- /***/ public String exceptionCaughtDuringExecutionOfMergeCommand;
- /***/ public String exceptionCaughtDuringExecutionOfPullCommand;
- /***/ public String exceptionCaughtDuringExecutionOfPushCommand;
- /***/ public String exceptionCaughtDuringExecutionOfResetCommand;
- /***/ public String exceptionCaughtDuringExecutionOfRevertCommand;
- /***/ public String exceptionCaughtDuringExecutionOfRmCommand;
- /***/ public String exceptionCaughtDuringExecutionOfTagCommand;
- /***/ public String exceptionCaughtDuringExcecutionOfCommand;
- /***/ public String exceptionHookExecutionInterrupted;
- /***/ public String exceptionOccurredDuringAddingOfOptionToALogCommand;
- /***/ public String exceptionOccurredDuringReadingOfGIT_DIR;
- /***/ public String exceptionWhileReadingPack;
- /***/ public String expectedACKNAKFoundEOF;
- /***/ public String expectedACKNAKGot;
- /***/ public String expectedBooleanStringValue;
- /***/ public String expectedCharacterEncodingGuesses;
- /***/ public String expectedEOFReceived;
- /***/ public String expectedGot;
- /***/ public String expectedLessThanGot;
- /***/ public String expectedPktLineWithService;
- /***/ public String expectedReceivedContentType;
- /***/ public String expectedReportForRefNotReceived;
- /***/ public String failedToDetermineFilterDefinition;
- /***/ public String failedUpdatingRefs;
- /***/ public String failureDueToOneOfTheFollowing;
- /***/ public String failureUpdatingFETCH_HEAD;
- /***/ public String failureUpdatingTrackingRef;
- /***/ public String fileCannotBeDeleted;
- /***/ public String fileIsTooBigForThisConvenienceMethod;
- /***/ public String fileIsTooLarge;
- /***/ public String fileModeNotSetForPath;
- /***/ public String filterExecutionFailed;
- /***/ public String filterExecutionFailedRc;
- /***/ public String findingGarbage;
- /***/ public String flagIsDisposed;
- /***/ public String flagNotFromThis;
- /***/ public String flagsAlreadyCreated;
- /***/ public String funnyRefname;
- /***/ public String gcFailed;
- /***/ public String gitmodulesNotFound;
- /***/ public String headRequiredToStash;
- /***/ public String hoursAgo;
- /***/ public String hugeIndexesAreNotSupportedByJgitYet;
- /***/ public String hunkBelongsToAnotherFile;
- /***/ public String hunkDisconnectedFromFile;
- /***/ public String hunkHeaderDoesNotMatchBodyLineCountOf;
- /***/ public String illegalArgumentNotA;
- /***/ public String illegalCombinationOfArguments;
- /***/ public String illegalHookName;
- /***/ public String illegalPackingPhase;
- /***/ public String illegalStateExists;
- /***/ public String improperlyPaddedBase64Input;
- /***/ public String incorrectHashFor;
- /***/ public String incorrectOBJECT_ID_LENGTH;
- /***/ public String indexFileCorruptedNegativeBucketCount;
- /***/ public String indexFileIsInUse;
- /***/ public String indexFileIsTooLargeForJgit;
- /***/ public String indexSignatureIsInvalid;
- /***/ public String indexWriteException;
- /***/ public String initFailedBareRepoDifferentDirs;
- /***/ public String initFailedDirIsNoDirectory;
- /***/ public String initFailedGitDirIsNoDirectory;
- /***/ public String initFailedNonBareRepoSameDirs;
- /***/ public String inMemoryBufferLimitExceeded;
- /***/ public String inputDidntMatchLength;
- /***/ public String inputStreamMustSupportMark;
- /***/ public String integerValueOutOfRange;
- /***/ public String internalRevisionError;
- /***/ public String internalServerError;
- /***/ public String interruptedWriting;
- /***/ public String inTheFuture;
- /***/ public String invalidAdvertisementOf;
- /***/ public String invalidAncestryLength;
- /***/ public String invalidBooleanValue;
- /***/ public String invalidChannel;
- /***/ public String invalidCharacterInBase64Data;
- /***/ public String invalidCommitParentNumber;
- /***/ public String invalidDepth;
- /***/ public String invalidEncryption;
- /***/ public String invalidExpandWildcard;
- /***/ public String invalidGitdirRef;
- /***/ public String invalidGitType;
- /***/ public String invalidId;
- /***/ public String invalidId0;
- /***/ public String invalidIdLength;
- /***/ public String invalidIgnoreParamSubmodule;
- /***/ public String invalidIgnoreRule;
- /***/ public String invalidIntegerValue;
- /***/ public String invalidKey;
- /***/ public String invalidLineInConfigFile;
- /***/ public String invalidModeFor;
- /***/ public String invalidModeForPath;
- /***/ public String invalidObject;
- /***/ public String invalidOldIdSent;
- /***/ public String invalidPacketLineHeader;
- /***/ public String invalidPath;
- /***/ public String invalidPathContainsSeparator;
- /***/ public String invalidPathPeriodAtEndWindows;
- /***/ public String invalidPathSpaceAtEndWindows;
- /***/ public String invalidPathReservedOnWindows;
- /***/ public String invalidReflogRevision;
- /***/ public String invalidRefName;
- /***/ public String invalidRemote;
- /***/ public String invalidShallowObject;
- /***/ public String invalidStageForPath;
- /***/ public String invalidTagOption;
- /***/ public String invalidTimeout;
- /***/ public String invalidTimeUnitValue2;
- /***/ public String invalidTimeUnitValue3;
- /***/ public String invalidTreeZeroLengthName;
- /***/ public String invalidURL;
- /***/ public String invalidWildcards;
- /***/ public String invalidRefSpec;
- /***/ public String invalidRepositoryStateNoHead;
- /***/ public String invalidWindowSize;
- /***/ public String isAStaticFlagAndHasNorevWalkInstance;
- /***/ public String JRELacksMD5Implementation;
- /***/ public String kNotInRange;
- /***/ public String largeObjectExceedsByteArray;
- /***/ public String largeObjectExceedsLimit;
- /***/ public String largeObjectException;
- /***/ public String largeObjectOutOfMemory;
- /***/ public String lengthExceedsMaximumArraySize;
- /***/ public String listingAlternates;
- /***/ public String listingPacks;
- /***/ public String localObjectsIncomplete;
- /***/ public String localRefIsMissingObjects;
- /***/ public String localRepository;
- /***/ public String lockCountMustBeGreaterOrEqual1;
- /***/ public String lockError;
- /***/ public String lockOnNotClosed;
- /***/ public String lockOnNotHeld;
- /***/ public String malformedpersonIdentString;
- /***/ public String maxCountMustBeNonNegative;
- /***/ public String mergeConflictOnNonNoteEntries;
- /***/ public String mergeConflictOnNotes;
- /***/ public String mergeStrategyAlreadyExistsAsDefault;
- /***/ public String mergeStrategyDoesNotSupportHeads;
- /***/ public String mergeUsingStrategyResultedInDescription;
- /***/ public String mergeRecursiveConflictsWhenMergingCommonAncestors;
- /***/ public String mergeRecursiveReturnedNoCommit;
- /***/ public String mergeRecursiveTooManyMergeBasesFor;
- /***/ public String messageAndTaggerNotAllowedInUnannotatedTags;
- /***/ public String minutesAgo;
- /***/ public String missingAccesskey;
- /***/ public String missingConfigurationForKey;
- /***/ public String missingDeltaBase;
- /***/ public String missingForwardImageInGITBinaryPatch;
- /***/ public String missingObject;
- /***/ public String missingPrerequisiteCommits;
- /***/ public String missingRequiredParameter;
- /***/ public String missingSecretkey;
- /***/ public String mixedStagesNotAllowed;
- /***/ public String mkDirFailed;
- /***/ public String mkDirsFailed;
- /***/ public String month;
- /***/ public String months;
- /***/ public String monthsAgo;
- /***/ public String multipleMergeBasesFor;
- /***/ public String need2Arguments;
- /***/ public String needPackOut;
- /***/ public String needsAtLeastOneEntry;
- /***/ public String needsWorkdir;
- /***/ public String newlineInQuotesNotAllowed;
- /***/ public String noApplyInDelete;
- /***/ public String noClosingBracket;
- /***/ public String noCredentialsProvider;
- /***/ public String noHEADExistsAndNoExplicitStartingRevisionWasSpecified;
- /***/ public String noHMACsupport;
- /***/ public String noMergeBase;
- /***/ public String noMergeHeadSpecified;
- /***/ public String noSuchRef;
- /***/ public String notABoolean;
- /***/ public String notABundle;
- /***/ public String notADIRCFile;
- /***/ public String notAGitDirectory;
- /***/ public String notAPACKFile;
- /***/ public String notARef;
- /***/ public String notASCIIString;
- /***/ public String notAuthorized;
- /***/ public String notAValidPack;
- /***/ public String notFound;
- /***/ public String nothingToFetch;
- /***/ public String nothingToPush;
- /***/ public String notMergedExceptionMessage;
- /***/ public String noXMLParserAvailable;
- /***/ public String objectAtHasBadZlibStream;
- /***/ public String objectAtPathDoesNotHaveId;
- /***/ public String objectIsCorrupt;
- /***/ public String objectIsCorrupt3;
- /***/ public String objectIsNotA;
- /***/ public String objectNotFound;
- /***/ public String objectNotFoundIn;
- /***/ public String obtainingCommitsForCherryPick;
- /***/ public String offsetWrittenDeltaBaseForObjectNotFoundInAPack;
- /***/ public String onlyAlreadyUpToDateAndFastForwardMergesAreAvailable;
- /***/ public String onlyOneFetchSupported;
- /***/ public String onlyOneOperationCallPerConnectionIsSupported;
- /***/ public String openFilesMustBeAtLeast1;
- /***/ public String openingConnection;
- /***/ public String operationCanceled;
- /***/ public String outputHasAlreadyBeenStarted;
- /***/ public String packChecksumMismatch;
- /***/ public String packCorruptedWhileWritingToFilesystem;
- /***/ public String packDoesNotMatchIndex;
- /***/ public String packedRefsHandleIsStale;
- /***/ public String packetSizeMustBeAtLeast;
- /***/ public String packetSizeMustBeAtMost;
- /***/ public String packedRefsCorruptionDetected;
- /***/ public String packfileCorruptionDetected;
- /***/ public String packFileInvalid;
- /***/ public String packfileIsTruncated;
- /***/ public String packfileIsTruncatedNoParam;
- /***/ public String packHandleIsStale;
- /***/ public String packHasUnresolvedDeltas;
- /***/ public String packInaccessible;
- /***/ public String packingCancelledDuringObjectsWriting;
- /***/ public String packObjectCountMismatch;
- /***/ public String packRefs;
- /***/ public String packSizeNotSetYet;
- /***/ public String packTooLargeForIndexVersion1;
- /***/ public String packWasDeleted;
- /***/ public String packWriterStatistics;
- /***/ public String panicCantRenameIndexFile;
- /***/ public String patchApplyException;
- /***/ public String patchFormatException;
- /***/ public String pathIsNotInWorkingDir;
- /***/ public String pathNotConfigured;
- /***/ public String peeledLineBeforeRef;
- /***/ public String peerDidNotSupplyACompleteObjectGraph;
- /***/ public String personIdentEmailNonNull;
- /***/ public String personIdentNameNonNull;
- /***/ public String prefixRemote;
- /***/ public String problemWithResolvingPushRefSpecsLocally;
- /***/ public String progressMonUploading;
- /***/ public String propertyIsAlreadyNonNull;
- /***/ public String pruneLoosePackedObjects;
- /***/ public String pruneLooseUnreferencedObjects;
- /***/ public String pullOnRepoWithoutHEADCurrentlyNotSupported;
- /***/ public String pullTaskName;
- /***/ public String pushCancelled;
- /***/ public String pushCertificateInvalidField;
- /***/ public String pushCertificateInvalidFieldValue;
- /***/ public String pushCertificateInvalidHeader;
- /***/ public String pushCertificateInvalidSignature;
- /***/ public String pushIsNotSupportedForBundleTransport;
- /***/ public String pushNotPermitted;
- /***/ public String pushOptionsNotSupported;
- /***/ public String rawLogMessageDoesNotParseAsLogEntry;
- /***/ public String readerIsRequired;
- /***/ public String readingObjectsFromLocalRepositoryFailed;
- /***/ public String readTimedOut;
- /***/ public String receivePackObjectTooLarge1;
- /***/ public String receivePackObjectTooLarge2;
- /***/ public String receivePackInvalidLimit;
- /***/ public String receivePackTooLarge;
- /***/ public String receivingObjects;
- /***/ public String refAlreadyExists;
- /***/ public String refAlreadyExists1;
- /***/ public String reflogEntryNotFound;
- /***/ public String refNotResolved;
- /***/ public String refUpdateReturnCodeWas;
- /***/ public String remoteConfigHasNoURIAssociated;
- /***/ public String remoteDoesNotHaveSpec;
- /***/ public String remoteDoesNotSupportSmartHTTPPush;
- /***/ public String remoteHungUpUnexpectedly;
- /***/ public String remoteNameCantBeNull;
- /***/ public String renameBranchFailedBecauseTag;
- /***/ public String renameBranchFailedUnknownReason;
- /***/ public String renameBranchUnexpectedResult;
- /***/ public String renameFileFailed;
- /***/ public String renamesAlreadyFound;
- /***/ public String renamesBreakingModifies;
- /***/ public String renamesFindingByContent;
- /***/ public String renamesFindingExact;
- /***/ public String renamesRejoiningModifies;
- /***/ public String repositoryAlreadyExists;
- /***/ public String repositoryConfigFileInvalid;
- /***/ public String repositoryNotFound;
- /***/ public String repositoryState_applyMailbox;
- /***/ public String repositoryState_bare;
- /***/ public String repositoryState_bisecting;
- /***/ public String repositoryState_conflicts;
- /***/ public String repositoryState_merged;
- /***/ public String repositoryState_normal;
- /***/ public String repositoryState_rebase;
- /***/ public String repositoryState_rebaseInteractive;
- /***/ public String repositoryState_rebaseOrApplyMailbox;
- /***/ public String repositoryState_rebaseWithMerge;
- /***/ public String requiredHashFunctionNotAvailable;
- /***/ public String resettingHead;
- /***/ public String resolvingDeltas;
- /***/ public String resultLengthIncorrect;
- /***/ public String rewinding;
- /***/ public String s3ActionDeletion;
- /***/ public String s3ActionReading;
- /***/ public String s3ActionWriting;
- /***/ public String searchForReuse;
- /***/ public String searchForSizes;
- /***/ public String secondsAgo;
- /***/ public String selectingCommits;
- /***/ public String sequenceTooLargeForDiffAlgorithm;
- /***/ public String serviceNotEnabledNoName;
- /***/ public String serviceNotPermitted;
- /***/ public String shallowCommitsAlreadyInitialized;
- /***/ public String shallowPacksRequireDepthWalk;
- /***/ public String shortCompressedStreamAt;
- /***/ public String shortReadOfBlock;
- /***/ public String shortReadOfOptionalDIRCExtensionExpectedAnotherBytes;
- /***/ public String shortSkipOfBlock;
- /***/ public String signingNotSupportedOnTag;
- /***/ public String similarityScoreMustBeWithinBounds;
- /***/ public String sizeExceeds2GB;
- /***/ public String skipMustBeNonNegative;
- /***/ public String smartHTTPPushDisabled;
- /***/ public String sourceDestinationMustMatch;
- /***/ public String sourceIsNotAWildcard;
- /***/ public String sourceRefDoesntResolveToAnyObject;
- /***/ public String sourceRefNotSpecifiedForRefspec;
- /***/ public String squashCommitNotUpdatingHEAD;
- /***/ public String staleRevFlagsOn;
- /***/ public String startingReadStageWithoutWrittenRequestDataPendingIsNotSupported;
- /***/ public String stashApplyConflict;
- /***/ public String stashApplyConflictInIndex;
- /***/ public String stashApplyFailed;
- /***/ public String stashApplyWithoutHead;
- /***/ public String stashApplyOnUnsafeRepository;
- /***/ public String stashCommitIncorrectNumberOfParents;
- /***/ public String stashDropDeleteRefFailed;
- /***/ public String stashDropFailed;
- /***/ public String stashDropMissingReflog;
- /***/ public String stashFailed;
- /***/ public String stashResolveFailed;
- /***/ public String statelessRPCRequiresOptionToBeEnabled;
- /***/ public String storePushCertMultipleRefs;
- /***/ public String storePushCertOneRef;
- /***/ public String storePushCertReflog;
- /***/ public String submoduleExists;
- /***/ public String submodulesNotSupported;
- /***/ public String submoduleParentRemoteUrlInvalid;
- /***/ public String supportOnlyPackIndexVersion2;
- /***/ public String symlinkCannotBeWrittenAsTheLinkTarget;
- /***/ public String systemConfigFileInvalid;
- /***/ public String tagAlreadyExists;
- /***/ public String tagNameInvalid;
- /***/ public String tagOnRepoWithoutHEADCurrentlyNotSupported;
- /***/ public String transactionAborted;
- /***/ public String theFactoryMustNotBeNull;
- /***/ public String timeIsUncertain;
- /***/ public String timerAlreadyTerminated;
- /***/ public String tooManyIncludeRecursions;
- /***/ public String topologicalSortRequired;
- /***/ public String transportExceptionBadRef;
- /***/ public String transportExceptionEmptyRef;
- /***/ public String transportExceptionInvalid;
- /***/ public String transportExceptionMissingAssumed;
- /***/ public String transportExceptionReadRef;
- /***/ public String transportNeedsRepository;
- /***/ public String transportProtoAmazonS3;
- /***/ public String transportProtoBundleFile;
- /***/ public String transportProtoFTP;
- /***/ public String transportProtoGitAnon;
- /***/ public String transportProtoHTTP;
- /***/ public String transportProtoLocal;
- /***/ public String transportProtoSFTP;
- /***/ public String transportProtoSSH;
- /***/ public String transportProtoTest;
- /***/ public String transportProvidedRefWithNoObjectId;
- /***/ public String transportSSHRetryInterrupt;
- /***/ public String treeEntryAlreadyExists;
- /***/ public String treeFilterMarkerTooManyFilters;
- /***/ public String treeIteratorDoesNotSupportRemove;
- /***/ public String treeWalkMustHaveExactlyTwoTrees;
- /***/ public String truncatedHunkLinesMissingForAncestor;
- /***/ public String truncatedHunkNewLinesMissing;
- /***/ public String truncatedHunkOldLinesMissing;
- /***/ public String tSizeMustBeGreaterOrEqual1;
- /***/ public String unableToCheckConnectivity;
- /***/ public String unableToCreateNewObject;
- /***/ public String unableToStore;
- /***/ public String unableToWrite;
- /***/ public String unauthorized;
- /***/ public String unencodeableFile;
- /***/ public String unexpectedCompareResult;
- /***/ public String unexpectedEndOfConfigFile;
- /***/ public String unexpectedEndOfInput;
- /***/ public String unexpectedHunkTrailer;
- /***/ public String unexpectedOddResult;
- /***/ public String unexpectedRefReport;
- /***/ public String unexpectedReportLine;
- /***/ public String unexpectedReportLine2;
- /***/ public String unknownOrUnsupportedCommand;
- /***/ public String unknownDIRCVersion;
- /***/ public String unknownHost;
- /***/ public String unknownIndexVersionOrCorruptIndex;
- /***/ public String unknownObject;
- /***/ public String unknownObjectType;
- /***/ public String unknownObjectType2;
- /***/ public String unknownRepositoryFormat;
- /***/ public String unknownRepositoryFormat2;
- /***/ public String unknownZlibError;
- /***/ public String unmergedPath;
- /***/ public String unmergedPaths;
- /***/ public String unpackException;
- /***/ public String unreadablePackIndex;
- /***/ public String unrecognizedRef;
- /***/ public String unsetMark;
- /***/ public String unsupportedAlternates;
- /***/ public String unsupportedArchiveFormat;
- /***/ public String unsupportedCommand0;
- /***/ public String unsupportedEncryptionAlgorithm;
- /***/ public String unsupportedEncryptionVersion;
- /***/ public String unsupportedGC;
- /***/ public String unsupportedMark;
- /***/ public String unsupportedOperationNotAddAtEnd;
- /***/ public String unsupportedPackIndexVersion;
- /***/ public String unsupportedPackVersion;
- /***/ public String unsupportedRepositoryDescription;
- /***/ public String updatingHeadFailed;
- /***/ public String updatingReferences;
- /***/ public String updatingRefFailed;
- /***/ public String upstreamBranchName;
- /***/ public String uriNotConfigured;
- /***/ public String uriNotFound;
- /***/ public String URINotSupported;
- /***/ public String URLNotFound;
- /***/ public String userConfigFileInvalid;
- /***/ public String walkFailure;
- /***/ public String wantNotValid;
- /***/ public String weeksAgo;
- /***/ public String windowSizeMustBeLesserThanLimit;
- /***/ public String windowSizeMustBePowerOf2;
- /***/ public String writerAlreadyInitialized;
- /***/ public String writeTimedOut;
- /***/ public String writingNotPermitted;
- /***/ public String writingNotSupported;
- /***/ public String writingObjects;
- /***/ public String wrongDecompressedLength;
- /***/ public String wrongRepositoryState;
- /***/ public String year;
- /***/ public String years;
- /***/ public String years0MonthsAgo;
- /***/ public String yearsAgo;
- /***/ public String yearsMonthsAgo;
- }
|
