mirrors
/
jgit
mirror of https://github.com/eclipse/jgit.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 204 Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
619 Commits
49 Branches
Tree: 9239c10385
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '9239c10385'
${ noResults }
jgit/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java

JGitText.java 20KB
Raw Normal View History

Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
log: Add whitespace ignore options Similar to what we did with diff, implement whitespace ignore options for log too. This requires us to define some means of creating any RawText object type at will inside of DiffFormatter, so we define a new factory interface to construct RawText instances on demand. Unfortunately we have to copy the entire block of common options. args4j only processes the options/arguments on the one command class and Java doesn't support multiple inheritance. Change-Id: Ia16cd3a11b850fffae9fbe7b721d7e43f1d0e8a5 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
14 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
​
​
​
Complete an abbreviation when formatting a patch If we are given a DiffEntry header that already has abbreviated ObjectIds on it, we may still be able to resolve those locally and output the difference. Try to do that through the new resolve API on ObjectReader. Change-Id: I0766aa5444b7b8fff73620290f8c9f54adc0be96 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
14 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
​
​
Git Porcelain API: Add Command The new Add command adds files to the Git Index. It uses the DirCache to access the git index. It works also in case of an existing conflict. Fileglobs (e.g. *.c) are not yet supported. The new Add command does add ignored files because there is no gitignore support in jgit yet. Bug: 318440 Change-Id: If16fdd4443e46b27361c2a18ed8f51668af5d9ff Signed-off-by: Stefan Lay <stefan.lay@sap.com>
14 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
​
​
​
​
​
​
​
​
​
"Bare" Repository should not return working directory. If a repository is "bare", it currently still returns a working directory. This conflicts with the specification of "bare"-ness. Bug: 311902 Change-Id: Ib54b31ddc80b9032e6e7bf013948bb83e12cfd88 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
14 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
​
​
​
Added merge support to CommitCommand The CommitCommand should take care to create a merge commit if the file $GIT_DIR/MERGE_HEAD exists. It should then read the parents for the merge commit out of this file. It should also take care that when commiting a merge and no commit message was specified to read the message from $GIT_DIR/MERGE_MSG. Finally the CommitCommand should remove these files if the commit succeeded. Change-Id: I4e292115085099d5b86546d2021680cb1454266c Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
14 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
Add a merge command to the jgit API Merges the current head with one other commit. In this first iteration the merge command supports only fast forward and already up-to-date. Change-Id: I0db480f061e01b343570cf7da02cac13a0cbdf8f Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
14 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
​
​
​
​
Implement a Dircache checkout (needed for merge) Implementation of a checkout (or 'git read-tree') operation which works together with DirCache. This implementation does similar things as WorkDirCheckout which main problem is that it works with deprecated GitIndex. Since GitIndex doesn't support multiple stages of a file which is required in merge situations this new implementation is required to enable merge support. Change-Id: I13f0f23ad60d98e5168118a7e7e7308e066ecf9c Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
14 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
​
​
​
​
​
​
​
​
​
​
Implement a Dircache checkout (needed for merge) Implementation of a checkout (or 'git read-tree') operation which works together with DirCache. This implementation does similar things as WorkDirCheckout which main problem is that it works with deprecated GitIndex. Since GitIndex doesn't support multiple stages of a file which is required in merge situations this new implementation is required to enable merge support. Change-Id: I13f0f23ad60d98e5168118a7e7e7308e066ecf9c Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
14 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
​
​
​
​
​
​
amend commit: Refactor repository construction to builder class During code review, Alex raised a few comments about commit 532421d98925 ("Refactor repository construction to builder class"). Due to the size of the related series we aren't going to go back and rebase in something this minor, so resolve them as a follow-up commit instead. Change-Id: Ied52f7a8f7252743353c58d20bfc3ec498933e00 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
14 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
​
​
​
​
​
​
​
​
​
​
​
Git Porcelain API: Add Command The new Add command adds files to the Git Index. It uses the DirCache to access the git index. It works also in case of an existing conflict. Fileglobs (e.g. *.c) are not yet supported. The new Add command does add ignored files because there is no gitignore support in jgit yet. Bug: 318440 Change-Id: If16fdd4443e46b27361c2a18ed8f51668af5d9ff Signed-off-by: Stefan Lay <stefan.lay@sap.com>
14 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
Add a merge command to the jgit API Merges the current head with one other commit. In this first iteration the merge command supports only fast forward and already up-to-date. Change-Id: I0db480f061e01b343570cf7da02cac13a0cbdf8f Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
14 years ago
Add TagCommand A tag command is added to the Git porcelain API. Tests were also added to stress test the tag command. Change-Id: Iab282a918eb51b0e9c55f628a3396ff01c9eb9eb Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
14 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
Added merge support to CommitCommand The CommitCommand should take care to create a merge commit if the file $GIT_DIR/MERGE_HEAD exists. It should then read the parents for the merge commit out of this file. It should also take care that when commiting a merge and no commit message was specified to read the message from $GIT_DIR/MERGE_MSG. Finally the CommitCommand should remove these files if the commit succeeded. Change-Id: I4e292115085099d5b86546d2021680cb1454266c Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
14 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
Implement a Dircache checkout (needed for merge) Implementation of a checkout (or 'git read-tree') operation which works together with DirCache. This implementation does similar things as WorkDirCheckout which main problem is that it works with deprecated GitIndex. Since GitIndex doesn't support multiple stages of a file which is required in merge situations this new implementation is required to enable merge support. Change-Id: I13f0f23ad60d98e5168118a7e7e7308e066ecf9c Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
14 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
Improve LargeObjectException reporting Use 3 different types of LargeObjectException for the 3 major ways that we can fail to load an object. For each of these use a unique string translation which describes the root cause better than just the ObjectId.name() does. Change-Id: I810c98d5691b74af9fc6cbd46fc9879e35a7bdca Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years ago
​
​
​
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
​
​
​
​
​
​
​
​
​
Add a merge command to the jgit API Merges the current head with one other commit. In this first iteration the merge command supports only fast forward and already up-to-date. Change-Id: I0db480f061e01b343570cf7da02cac13a0cbdf8f Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
14 years ago
​
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
Simplify ObjectLoaders coming from PackFile We no longer need an ObjectLoader to be lazy and try to delay the materialization of the object content. That was done only to support PackWriter searching for a good reuse candidate. Instead, simplify the code base by doing the materialization immediately when the loader asks for it, because any caller asking for the loader is going to need the content. Change-Id: Id867b1004529744f234ab8f9cfab3d2c52ca3bd0 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
14 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
Add a merge command to the jgit API Merges the current head with one other commit. In this first iteration the merge command supports only fast forward and already up-to-date. Change-Id: I0db480f061e01b343570cf7da02cac13a0cbdf8f Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
14 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
Add a merge command to the jgit API Merges the current head with one other commit. In this first iteration the merge command supports only fast forward and already up-to-date. Change-Id: I0db480f061e01b343570cf7da02cac13a0cbdf8f Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
14 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
Added a preliminary version of rename detection JGit does not currently do rename detection during diffs. I added a class that, given a TreeWalk to iterate over, can output a list of DiffEntry's for that TreeWalk, taking into account renames. This class only detects renames by SHA1's. More complex rename detection, along the lines of what C Git does will be added later. Change-Id: I93606ce15da70df6660651ec322ea50718dd7c04
14 years ago
Break dissimilar file pairs during diff File pairs that are very dissimilar during a diff were not being broken apart into their constituent ADD/DELETE pairs. The leads to sub-optimal rename detection. Take, for example, this situation: A file exists at src/a.txt containing "foo". A user renames src/a.txt to src/b.txt, then adds a new src/a.txt containing "bar". Even though the old a.txt and the new b.txt are identical, the rename detection algorithm would not detect it as a rename since it was already paired in a MODIFY. I added code to split all MODIFYs below a certain score into their constituent ADD/DELETE pairs. This allows situations like the one I described above to be more correctly handled. Change-Id: I22c04b70581f206bbc68c4cd1ee87a1f663b418e Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
14 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
​
Break dissimilar file pairs during diff File pairs that are very dissimilar during a diff were not being broken apart into their constituent ADD/DELETE pairs. The leads to sub-optimal rename detection. Take, for example, this situation: A file exists at src/a.txt containing "foo". A user renames src/a.txt to src/b.txt, then adds a new src/a.txt containing "bar". Even though the old a.txt and the new b.txt are identical, the rename detection algorithm would not detect it as a rename since it was already paired in a MODIFY. I added code to split all MODIFYs below a certain score into their constituent ADD/DELETE pairs. This allows situations like the one I described above to be more correctly handled. Change-Id: I22c04b70581f206bbc68c4cd1ee87a1f663b418e Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
14 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
Refactor repository construction to builder class The new FileRepositoryBuilder class helps applications to construct a properly configured FileRepository, with properties assumed based upon the standard Git rules for the local filesystem. To better support simple command line applications, environment variable handling and repository searching was moved into this builder class. The change gets rid of the ever-growing FileRepository constructor variants, and the multitude of java.io.File typed parameters, by using simple named setter methods. Change-Id: I17e8e0392ad1dbf6a90a7eb49a6d809388d27e4c Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
14 years ago
Redo DiffFormatter API to be easier to use Passing around the OutputStream and the Repository is crazy. Instead put the stream in the constructor, since this formatter exists only to output to the stream, and put the repository as a member variable that can be optionally set. Change-Id: I2bad012fee7f40dc1346700ebd19f1e048982878 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
14 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
Internationalize RepositoryState descriptions Change-Id: I104cd62f3e89acf010b1d40a2b08e7f68f63bb85 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
14 years ago
​
​
​
​
​
​
​
​
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
​
Allow object reuse selection to occur in parallel ObjectReader implementations may wish to use multiple threads in order to evaluate object reuse faster. Let the reader make that decision by passing the iteration down into the reader. Because the work is pushed into the reader, it may need to locate a given ObjectToPack given its ObjectId. This can easily occur if the reader has sent a list of ObjectIds to the object database and gets back information keyed only by ObjectId, without the ObjectToPack handle. Expose lookup using the PackWriter's own internal map, so the reader doesn't need to build a redundant copy to track the assocation of ObjectId back to ObjectToPack. Change-Id: I0c536405a55034881fb5db92a2d2a99534faed34 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
14 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
​
​
​
​
Add TagCommand A tag command is added to the Git porcelain API. Tests were also added to stress test the tag command. Change-Id: Iab282a918eb51b0e9c55f628a3396ff01c9eb9eb Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
14 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
Add setLength(long) to DirCacheEntry Applications should favor the long style interface, especially when their source input is a long type, e.g. coming from java.io.File. This way when the index format is later changed to support a larger file size than 2 GiB we can handle it by just changing the entry code, and not need to fix a lot of applications. Change-Id: I332563caeb110014e2d544dc33050ce67ae9e897 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
14 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
​
​
​
​
​
​
​
Meaningful error message when trying to check-out submodules Currently, a NullPointerException occurs in this case. We should instead throw a more meaningful Exception with a proper message. This is a very "stupid" implementation which simply checks for the existence of a ".gitmodules" file. Bug: 300731 Bug: 306765 Bug: 308452 Bug: 314853 Change-Id: I155aa340a85cbc5d7d60da31dba199fc30689b67 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
14 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
Add TagCommand A tag command is added to the Git porcelain API. Tests were also added to stress test the tag command. Change-Id: Iab282a918eb51b0e9c55f628a3396ff01c9eb9eb Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
14 years ago
​
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
Improve LargeObjectException reporting Use 3 different types of LargeObjectException for the 3 major ways that we can fail to load an object. For each of these use a unique string translation which describes the root cause better than just the ObjectId.name() does. Change-Id: I810c98d5691b74af9fc6cbd46fc9879e35a7bdca Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
​
​
Fix infinite loop in IndexPack A programming error using the Inflater API led to an infinite loop within IndexPack, caused by the Inflater returning 0 from the inflate() method, but it didn't want more input. This happens when it has reached the end of the stream, or has reached a spot asking for an external dictionary. Such a case is a failure for us, and we should abort out. Thanks to Alex for pointing out that we had 3 implementations of the inflate rountine, which should be consolidated into one and use a switch to determine where to load data from. Bug: 317416 Change-Id: I34120482375b687ea36ed9154002d77047e94b1f Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
14 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
ReceivePack: Rethrow exceptions caught during indexing If we get an exception while indexing the incoming pack, its likely a stream corruption. We already report an error to the client, but we eat the stack trace, which makes debugging issues related to a bug inside of JGit nearly impossible. Rethrow it under a new type UnpackException, so embedding servers or applications can catch the error and provide it to a human who might be able to forward such traces onto a JGit developer for evaluation. Change-Id: Icad41148bbc0c76f284c7033a195a6b51911beab Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
13 years ago
Externalize strings from JGit The strings are externalized into the root resource bundles. The resource bundles are stored under the new "resources" source folder to get proper maven build. Strings from tests are, in general, not externalized. Only in cases where it was necessary to make the test pass the strings were externalized. This was typically necessary in cases where e.getMessage() was used in assert and the exception message was slightly changed due to reuse of the externalized strings. Change-Id: Ic0f29c80b9a54fcec8320d8539a3e112852a1f7b Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
14 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466 
  1. /*

  2.  * Copyright (C) 2010, Sasa Zivkov <sasa.zivkov@sap.com>

  3.  * and other copyright owners as documented in the project's IP log.

  4.  *

  5.  * This program and the accompanying materials are made available

  6.  * under the terms of the Eclipse Distribution License v1.0 which

  7.  * accompanies this distribution, is reproduced below, and is

  8.  * available at http://www.eclipse.org/org/documents/edl-v10.php

  9.  *

  10.  * All rights reserved.

  11.  *

  12.  * Redistribution and use in source and binary forms, with or

  13.  * without modification, are permitted provided that the following

  14.  * conditions are met:

  15.  *

  16.  * - Redistributions of source code must retain the above copyright

  17.  *   notice, this list of conditions and the following disclaimer.

  18.  *

  19.  * - Redistributions in binary form must reproduce the above

  20.  *   copyright notice, this list of conditions and the following

  21.  *   disclaimer in the documentation and/or other materials provided

  22.  *   with the distribution.

  23.  *

  24.  * - Neither the name of the Eclipse Foundation, Inc. nor the

  25.  *   names of its contributors may be used to endorse or promote

  26.  *   products derived from this software without specific prior

  27.  *   written permission.

  28.  *

  29.  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND

  30.  * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,

  31.  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

  32.  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

  33.  * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

  34.  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

  35.  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

  36.  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

  37.  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER

  38.  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

  39.  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

  40.  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF

  41.  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

  42.  */

  43. 

  44. package org.eclipse.jgit;

  45. 

  46. import org.eclipse.jgit.nls.NLS;

  47. import org.eclipse.jgit.nls.TranslationBundle;

  48. 

  49. /**

  50.  * Translation bundle for JGit core

  51.  */

  52. public class JGitText extends TranslationBundle {

  53. 

  54. 	/**

  55. 	 * @return an instance of this translation bundle

  56. 	 */

  57. 	public static JGitText get() {

  58. 		return NLS.getBundleFor(JGitText.class);

  59. 	}

  60. 

  61. 	/***/ public String DIRCChecksumMismatch;

  62. 	/***/ public String DIRCExtensionIsTooLargeAt;

  63. 	/***/ public String DIRCExtensionNotSupportedByThisVersion;

  64. 	/***/ public String DIRCHasTooManyEntries;

  65. 	/***/ public String JRELacksMD5Implementation;

  66. 	/***/ public String URINotSupported;

  67. 	/***/ public String URLNotFound;

  68. 	/***/ public String aNewObjectIdIsRequired;

  69. 	/***/ public String abbreviationLengthMustBeNonNegative;

  70. 	/***/ public String advertisementCameBefore;

  71. 	/***/ public String advertisementOfCameBefore;

  72. 	/***/ public String amazonS3ActionFailed;

  73. 	/***/ public String amazonS3ActionFailedGivingUp;

  74. 	/***/ public String ambiguousObjectAbbreviation;

  75. 	/***/ public String anExceptionOccurredWhileTryingToAddTheIdOfHEAD;

  76. 	/***/ public String anSSHSessionHasBeenAlreadyCreated;

  77. 	/***/ public String atLeastOnePathIsRequired;

  78. 	/***/ public String atLeastOnePatternIsRequired;

  79. 	/***/ public String atLeastTwoFiltersNeeded;

  80. 	/***/ public String badBase64InputCharacterAt;

  81. 	/***/ public String badEntryDelimiter;

  82. 	/***/ public String badEntryName;

  83. 	/***/ public String badEscape;

  84. 	/***/ public String badGroupHeader;

  85. 	/***/ public String badObjectType;

  86. 	/***/ public String badSectionEntry;

  87. 	/***/ public String base64InputNotProperlyPadded;

  88. 	/***/ public String baseLengthIncorrect;

  89. 	/***/ public String bareRepositoryNoWorkdirAndIndex;

  90. 	/***/ public String blobNotFound;

  91. 	/***/ public String blobNotFoundForPath;

  92. 	/***/ public String cannotBeCombined;

  93. 	/***/ public String cannotCombineTreeFilterWithRevFilter;

  94. 	/***/ public String cannotCommitOnARepoWithState;

  95. 	/***/ public String cannotCommitWriteTo;

  96. 	/***/ public String cannotConnectPipes;

  97. 	/***/ public String cannotConvertScriptToText;

  98. 	/***/ public String cannotCreateConfig;

  99. 	/***/ public String cannotCreateDirectory;

  100. 	/***/ public String cannotCreateHEAD;

  101. 	/***/ public String cannotDeleteFile;

  102. 	/***/ public String cannotDeleteStaleTrackingRef2;

  103. 	/***/ public String cannotDeleteStaleTrackingRef;

  104. 	/***/ public String cannotDetermineProxyFor;

  105. 	/***/ public String cannotDownload;

  106. 	/***/ public String cannotExecute;

  107. 	/***/ public String cannotGet;

  108. 	/***/ public String cannotListRefs;

  109. 	/***/ public String cannotLock;

  110. 	/***/ public String cannotLockFile;

  111. 	/***/ public String cannotLockPackIn;

  112. 	/***/ public String cannotMatchOnEmptyString;

  113. 	/***/ public String cannotMoveIndexTo;

  114. 	/***/ public String cannotMovePackTo;

  115. 	/***/ public String cannotOpenService;

  116. 	/***/ public String cannotParseGitURIish;

  117. 	/***/ public String cannotRead;

  118. 	/***/ public String cannotReadBlob;

  119. 	/***/ public String cannotReadCommit;

  120. 	/***/ public String cannotReadFile;

  121. 	/***/ public String cannotReadHEAD;

  122. 	/***/ public String cannotReadObject;

  123. 	/***/ public String cannotReadTree;

  124. 	/***/ public String cannotResolveLocalTrackingRefForUpdating;

  125. 	/***/ public String cannotStoreObjects;

  126. 	/***/ public String cannotUnloadAModifiedTree;

  127. 	/***/ public String cannotWorkWithOtherStagesThanZeroRightNow;

  128. 	/***/ public String cantFindObjectInReversePackIndexForTheSpecifiedOffset;

  129. 	/***/ public String cantPassMeATree;

  130. 	/***/ public String channelMustBeInRange0_255;

  131. 	/***/ public String characterClassIsNotSupported;

  132. 	/***/ public String checkoutConflictWithFile;

  133. 	/***/ public String checkoutConflictWithFiles;

  134. 	/***/ public String classCastNotA;

  135. 	/***/ public String collisionOn;

  136. 	/***/ public String commandWasCalledInTheWrongState;

  137. 	/***/ public String commitAlreadyExists;

  138. 	/***/ public String commitMessageNotSpecified;

  139. 	/***/ public String commitOnRepoWithoutHEADCurrentlyNotSupported;

  140. 	/***/ public String compressingObjects;

  141. 	/***/ public String connectionFailed;

  142. 	/***/ public String connectionTimeOut;

  143. 	/***/ public String contextMustBeNonNegative;

  144. 	/***/ public String corruptObjectBadStream;

  145. 	/***/ public String corruptObjectBadStreamCorruptHeader;

  146. 	/***/ public String corruptObjectGarbageAfterSize;

  147. 	/***/ public String corruptObjectIncorrectLength;

  148. 	/***/ public String corruptObjectInvalidEntryMode;

  149. 	/***/ public String corruptObjectInvalidMode2;

  150. 	/***/ public String corruptObjectInvalidMode3;

  151. 	/***/ public String corruptObjectInvalidMode;

  152. 	/***/ public String corruptObjectInvalidType2;

  153. 	/***/ public String corruptObjectInvalidType;

  154. 	/***/ public String corruptObjectMalformedHeader;

  155. 	/***/ public String corruptObjectNegativeSize;

  156. 	/***/ public String corruptObjectNoAuthor;

  157. 	/***/ public String corruptObjectNoCommitter;

  158. 	/***/ public String corruptObjectNoHeader;

  159. 	/***/ public String corruptObjectNoObject;

  160. 	/***/ public String corruptObjectNoTagName;

  161. 	/***/ public String corruptObjectNoTaggerBadHeader;

  162. 	/***/ public String corruptObjectNoTaggerHeader;

  163. 	/***/ public String corruptObjectNoType;

  164. 	/***/ public String corruptObjectNotree;

  165. 	/***/ public String corruptObjectPackfileChecksumIncorrect;

  166. 	/***/ public String corruptionDetectedReReadingAt;

  167. 	/***/ public String couldNotCheckOutBecauseOfConflicts;

  168. 	/***/ public String couldNotDeleteLockFileShouldNotHappen;

  169. 	/***/ public String couldNotDeleteTemporaryIndexFileShouldNotHappen;

  170. 	/***/ public String couldNotLockHEAD;

  171. 	/***/ public String couldNotReadIndexInOneGo;

  172. 	/***/ public String couldNotRenameDeleteOldIndex;

  173. 	/***/ public String couldNotRenameTemporaryFile;

  174. 	/***/ public String couldNotRenameTemporaryIndexFileToIndex;

  175. 	/***/ public String couldNotURLEncodeToUTF8;

  176. 	/***/ public String couldNotWriteFile;

  177. 	/***/ public String countingObjects;

  178. 	/***/ public String creatingDeltasIsNotImplemented;

  179. 	/***/ public String daemonAlreadyRunning;

  180. 	/***/ public String deletingNotSupported;

  181. 	/***/ public String destinationIsNotAWildcard;

  182. 	/***/ public String dirCacheDoesNotHaveABackingFile;

  183. 	/***/ public String dirCacheFileIsNotLocked;

  184. 	/***/ public String dirCacheIsNotLocked;

  185. 	/***/ public String dirtyFilesExist;

  186. 	/***/ public String doesNotHandleMode;

  187. 	/***/ public String downloadCancelled;

  188. 	/***/ public String downloadCancelledDuringIndexing;

  189. 	/***/ public String duplicateAdvertisementsOf;

  190. 	/***/ public String duplicateRef;

  191. 	/***/ public String duplicateRemoteRefUpdateIsIllegal;

  192. 	/***/ public String duplicateStagesNotAllowed;

  193. 	/***/ public String eitherGitDirOrWorkTreeRequired;

  194. 	/***/ public String emptyPathNotPermitted;

  195. 	/***/ public String encryptionError;

  196. 	/***/ public String endOfFileInEscape;

  197. 	/***/ public String entryNotFoundByPath;

  198. 	/***/ public String errorDecodingFromFile;

  199. 	/***/ public String errorEncodingFromFile;

  200. 	/***/ public String errorInBase64CodeReadingStream;

  201. 	/***/ public String errorInPackedRefs;

  202. 	/***/ public String errorInvalidProtocolWantedOldNewRef;

  203. 	/***/ public String errorListing;

  204. 	/***/ public String errorOccurredDuringUnpackingOnTheRemoteEnd;

  205. 	/***/ public String errorReadingInfoRefs;

  206. 	/***/ public String exceptionCaughtDuringExecutionOfAddCommand;

  207. 	/***/ public String exceptionCaughtDuringExecutionOfCommitCommand;

  208. 	/***/ public String exceptionCaughtDuringExecutionOfMergeCommand;

  209. 	/***/ public String exceptionCaughtDuringExecutionOfTagCommand;

  210. 	/***/ public String exceptionOccuredDuringAddingOfOptionToALogCommand;

  211. 	/***/ public String exceptionOccuredDuringReadingOfGIT_DIR;

  212. 	/***/ public String expectedACKNAKFoundEOF;

  213. 	/***/ public String expectedACKNAKGot;

  214. 	/***/ public String expectedBooleanStringValue;

  215. 	/***/ public String expectedCharacterEncodingGuesses;

  216. 	/***/ public String expectedEOFReceived;

  217. 	/***/ public String expectedGot;

  218. 	/***/ public String expectedPktLineWithService;

  219. 	/***/ public String expectedReceivedContentType;

  220. 	/***/ public String expectedReportForRefNotReceived;

  221. 	/***/ public String failedUpdatingRefs;

  222. 	/***/ public String failureDueToOneOfTheFollowing;

  223. 	/***/ public String failureUpdatingFETCH_HEAD;

  224. 	/***/ public String failureUpdatingTrackingRef;

  225. 	/***/ public String fileCannotBeDeleted;

  226. 	/***/ public String fileIsTooBigForThisConvenienceMethod;

  227. 	/***/ public String fileIsTooLarge;

  228. 	/***/ public String fileModeNotSetForPath;

  229. 	/***/ public String flagIsDisposed;

  230. 	/***/ public String flagNotFromThis;

  231. 	/***/ public String flagsAlreadyCreated;

  232. 	/***/ public String funnyRefname;

  233. 	/***/ public String hugeIndexesAreNotSupportedByJgitYet;

  234. 	/***/ public String hunkBelongsToAnotherFile;

  235. 	/***/ public String hunkDisconnectedFromFile;

  236. 	/***/ public String hunkHeaderDoesNotMatchBodyLineCountOf;

  237. 	/***/ public String illegalArgumentNotA;

  238. 	/***/ public String illegalStateExists;

  239. 	/***/ public String improperlyPaddedBase64Input;

  240. 	/***/ public String inMemoryBufferLimitExceeded;

  241. 	/***/ public String incorrectHashFor;

  242. 	/***/ public String incorrectOBJECT_ID_LENGTH;

  243. 	/***/ public String incorrectObjectType_COMMITnorTREEnorBLOBnorTAG;

  244. 	/***/ public String indexFileIsInUse;

  245. 	/***/ public String indexFileIsTooLargeForJgit;

  246. 	/***/ public String indexSignatureIsInvalid;

  247. 	/***/ public String indexWriteException;

  248. 	/***/ public String integerValueOutOfRange;

  249. 	/***/ public String internalRevisionError;

  250. 	/***/ public String interruptedWriting;

  251. 	/***/ public String invalidAdvertisementOf;

  252. 	/***/ public String invalidAncestryLength;

  253. 	/***/ public String invalidBooleanValue;

  254. 	/***/ public String invalidChannel;

  255. 	/***/ public String invalidCharacterInBase64Data;

  256. 	/***/ public String invalidCommitParentNumber;

  257. 	/***/ public String invalidEncryption;

  258. 	/***/ public String invalidGitType;

  259. 	/***/ public String invalidId;

  260. 	/***/ public String invalidIdLength;

  261. 	/***/ public String invalidIntegerValue;

  262. 	/***/ public String invalidKey;

  263. 	/***/ public String invalidLineInConfigFile;

  264. 	/***/ public String invalidModeFor;

  265. 	/***/ public String invalidModeForPath;

  266. 	/***/ public String invalidObject;

  267. 	/***/ public String invalidOldIdSent;

  268. 	/***/ public String invalidPacketLineHeader;

  269. 	/***/ public String invalidPath;

  270. 	/***/ public String invalidRefName;

  271. 	/***/ public String invalidStageForPath;

  272. 	/***/ public String invalidTagOption;

  273. 	/***/ public String invalidTimeout;

  274. 	/***/ public String invalidURL;

  275. 	/***/ public String invalidWildcards;

  276. 	/***/ public String invalidWindowSize;

  277. 	/***/ public String isAStaticFlagAndHasNorevWalkInstance;

  278. 	/***/ public String kNotInRange;

  279. 	/***/ public String largeObjectException;

  280. 	/***/ public String largeObjectOutOfMemory;

  281. 	/***/ public String largeObjectExceedsByteArray;

  282. 	/***/ public String largeObjectExceedsLimit;

  283. 	/***/ public String lengthExceedsMaximumArraySize;

  284. 	/***/ public String listingAlternates;

  285. 	/***/ public String localObjectsIncomplete;

  286. 	/***/ public String localRefIsMissingObjects;

  287. 	/***/ public String lockCountMustBeGreaterOrEqual1;

  288. 	/***/ public String lockError;

  289. 	/***/ public String lockOnNotClosed;

  290. 	/***/ public String lockOnNotHeld;

  291. 	/***/ public String malformedpersonIdentString;

  292. 	/***/ public String mergeStrategyAlreadyExistsAsDefault;

  293. 	/***/ public String mergeStrategyDoesNotSupportHeads;

  294. 	/***/ public String mergeUsingStrategyResultedInDescription;

  295. 	/***/ public String missingAccesskey;

  296. 	/***/ public String missingDeltaBase;

  297. 	/***/ public String missingForwardImageInGITBinaryPatch;

  298. 	/***/ public String missingObject;

  299. 	/***/ public String missingPrerequisiteCommits;

  300. 	/***/ public String missingSecretkey;

  301. 	/***/ public String mixedStagesNotAllowed;

  302. 	/***/ public String multipleMergeBasesFor;

  303. 	/***/ public String need2Arguments;

  304. 	/***/ public String needPackOut;

  305. 	/***/ public String needsAtLeastOneEntry;

  306. 	/***/ public String needsWorkdir;

  307. 	/***/ public String newlineInQuotesNotAllowed;

  308. 	/***/ public String noApplyInDelete;

  309. 	/***/ public String noClosingBracket;

  310. 	/***/ public String noHEADExistsAndNoExplicitStartingRevisionWasSpecified;

  311. 	/***/ public String noHMACsupport;

  312. 	/***/ public String noMergeHeadSpecified;

  313. 	/***/ public String noSuchRef;

  314. 	/***/ public String noXMLParserAvailable;

  315. 	/***/ public String notABoolean;

  316. 	/***/ public String notABundle;

  317. 	/***/ public String notADIRCFile;

  318. 	/***/ public String notAGitDirectory;

  319. 	/***/ public String notAPACKFile;

  320. 	/***/ public String notARef;

  321. 	/***/ public String notASCIIString;

  322. 	/***/ public String notAValidPack;

  323. 	/***/ public String notFound;

  324. 	/***/ public String notValid;

  325. 	/***/ public String nothingToFetch;

  326. 	/***/ public String nothingToPush;

  327. 	/***/ public String objectAtHasBadZlibStream;

  328. 	/***/ public String objectAtPathDoesNotHaveId;

  329. 	/***/ public String objectIsCorrupt;

  330. 	/***/ public String objectIsNotA;

  331. 	/***/ public String objectNotFoundIn;

  332. 	/***/ public String offsetWrittenDeltaBaseForObjectNotFoundInAPack;

  333. 	/***/ public String onlyAlreadyUpToDateAndFastForwardMergesAreAvailable;

  334. 	/***/ public String onlyOneFetchSupported;

  335. 	/***/ public String onlyOneOperationCallPerConnectionIsSupported;

  336. 	/***/ public String openFilesMustBeAtLeast1;

  337. 	/***/ public String openingConnection;

  338. 	/***/ public String outputHasAlreadyBeenStarted;

  339. 	/***/ public String packChecksumMismatch;

  340. 	/***/ public String packCorruptedWhileWritingToFilesystem;

  341. 	/***/ public String packDoesNotMatchIndex;

  342. 	/***/ public String packFileInvalid;

  343. 	/***/ public String packHasUnresolvedDeltas;

  344. 	/***/ public String packObjectCountMismatch;

  345. 	/***/ public String packTooLargeForIndexVersion1;

  346. 	/***/ public String packetSizeMustBeAtLeast;

  347. 	/***/ public String packetSizeMustBeAtMost;

  348. 	/***/ public String packfileCorruptionDetected;

  349. 	/***/ public String packfileIsTruncated;

  350. 	/***/ public String packingCancelledDuringObjectsWriting;

  351. 	/***/ public String pathIsNotInWorkingDir;

  352. 	/***/ public String peeledLineBeforeRef;

  353. 	/***/ public String peerDidNotSupplyACompleteObjectGraph;

  354. 	/***/ public String prefixRemote;

  355. 	/***/ public String problemWithResolvingPushRefSpecsLocally;

  356. 	/***/ public String progressMonUploading;

  357. 	/***/ public String propertyIsAlreadyNonNull;

  358. 	/***/ public String pushCancelled;

  359. 	/***/ public String pushIsNotSupportedForBundleTransport;

  360. 	/***/ public String pushNotPermitted;

  361. 	/***/ public String rawLogMessageDoesNotParseAsLogEntry;

  362. 	/***/ public String readTimedOut;

  363. 	/***/ public String readingObjectsFromLocalRepositoryFailed;

  364. 	/***/ public String receivingObjects;

  365. 	/***/ public String refUpdateReturnCodeWas;

  366. 	/***/ public String reflogsNotYetSupportedByRevisionParser;

  367. 	/***/ public String remoteConfigHasNoURIAssociated;

  368. 	/***/ public String remoteDoesNotHaveSpec;

  369. 	/***/ public String remoteDoesNotSupportSmartHTTPPush;

  370. 	/***/ public String remoteHungUpUnexpectedly;

  371. 	/***/ public String remoteNameCantBeNull;

  372. 	/***/ public String renamesAlreadyFound;

  373. 	/***/ public String renamesBreakingModifies;

  374. 	/***/ public String renamesFindingByContent;

  375. 	/***/ public String renamesFindingExact;

  376. 	/***/ public String renamesRejoiningModifies;

  377. 	/***/ public String repositoryAlreadyExists;

  378. 	/***/ public String repositoryConfigFileInvalid;

  379. 	/***/ public String repositoryIsRequired;

  380. 	/***/ public String repositoryNotFound;

  381. 	/***/ public String repositoryState_applyMailbox;

  382. 	/***/ public String repositoryState_bisecting;

  383. 	/***/ public String repositoryState_conflicts;

  384. 	/***/ public String repositoryState_merged;

  385. 	/***/ public String repositoryState_normal;

  386. 	/***/ public String repositoryState_rebase;

  387. 	/***/ public String repositoryState_rebaseInteractive;

  388. 	/***/ public String repositoryState_rebaseOrApplyMailbox;

  389. 	/***/ public String repositoryState_rebaseWithMerge;

  390. 	/***/ public String requiredHashFunctionNotAvailable;

  391. 	/***/ public String resolvingDeltas;

  392. 	/***/ public String searchForReuse;

  393. 	/***/ public String serviceNotPermitted;

  394. 	/***/ public String shortCompressedStreamAt;

  395. 	/***/ public String shortReadOfBlock;

  396. 	/***/ public String shortReadOfOptionalDIRCExtensionExpectedAnotherBytes;

  397. 	/***/ public String shortSkipOfBlock;

  398. 	/***/ public String signingNotSupportedOnTag;

  399. 	/***/ public String similarityScoreMustBeWithinBounds;

  400. 	/***/ public String sizeExceeds2GB;

  401. 	/***/ public String smartHTTPPushDisabled;

  402. 	/***/ public String sourceDestinationMustMatch;

  403. 	/***/ public String sourceIsNotAWildcard;

  404. 	/***/ public String sourceRefDoesntResolveToAnyObject;

  405. 	/***/ public String sourceRefNotSpecifiedForRefspec;

  406. 	/***/ public String staleRevFlagsOn;

  407. 	/***/ public String startingReadStageWithoutWrittenRequestDataPendingIsNotSupported;

  408. 	/***/ public String statelessRPCRequiresOptionToBeEnabled;

  409. 	/***/ public String submodulesNotSupported;

  410. 	/***/ public String symlinkCannotBeWrittenAsTheLinkTarget;

  411. 	/***/ public String tagNameInvalid;

  412. 	/***/ public String tagOnRepoWithoutHEADCurrentlyNotSupported;

  413. 	/***/ public String tSizeMustBeGreaterOrEqual1;

  414. 	/***/ public String theFactoryMustNotBeNull;

  415. 	/***/ public String timerAlreadyTerminated;

  416. 	/***/ public String topologicalSortRequired;

  417. 	/***/ public String transportExceptionBadRef;

  418. 	/***/ public String transportExceptionEmptyRef;

  419. 	/***/ public String transportExceptionInvalid;

  420. 	/***/ public String transportExceptionMissingAssumed;

  421. 	/***/ public String transportExceptionReadRef;

  422. 	/***/ public String treeEntryAlreadyExists;

  423. 	/***/ public String treeIteratorDoesNotSupportRemove;

  424. 	/***/ public String truncatedHunkLinesMissingForAncestor;

  425. 	/***/ public String truncatedHunkNewLinesMissing;

  426. 	/***/ public String truncatedHunkOldLinesMissing;

  427. 	/***/ public String unableToCheckConnectivity;

  428. 	/***/ public String unableToStore;

  429. 	/***/ public String unableToWrite;

  430. 	/***/ public String unencodeableFile;

  431. 	/***/ public String unexpectedEndOfConfigFile;

  432. 	/***/ public String unexpectedHunkTrailer;

  433. 	/***/ public String unexpectedOddResult;

  434. 	/***/ public String unexpectedRefReport;

  435. 	/***/ public String unexpectedReportLine2;

  436. 	/***/ public String unexpectedReportLine;

  437. 	/***/ public String unknownDIRCVersion;

  438. 	/***/ public String unknownHost;

  439. 	/***/ public String unknownIndexVersionOrCorruptIndex;

  440. 	/***/ public String unknownObject;

  441. 	/***/ public String unknownObjectType;

  442. 	/***/ public String unknownRepositoryFormat2;

  443. 	/***/ public String unknownRepositoryFormat;

  444. 	/***/ public String unknownZlibError;

  445. 	/***/ public String unmergedPath;

  446. 	/***/ public String unpackException;

  447. 	/***/ public String unreadablePackIndex;

  448. 	/***/ public String unrecognizedRef;

  449. 	/***/ public String unsupportedCommand0;

  450. 	/***/ public String unsupportedEncryptionAlgorithm;

  451. 	/***/ public String unsupportedEncryptionVersion;

  452. 	/***/ public String unsupportedOperationNotAddAtEnd;

  453. 	/***/ public String unsupportedPackIndexVersion;

  454. 	/***/ public String unsupportedPackVersion;

  455. 	/***/ public String updatingRefFailed;

  456. 	/***/ public String userConfigFileInvalid;

  457. 	/***/ public String walkFailure;

  458. 	/***/ public String windowSizeMustBeLesserThanLimit;

  459. 	/***/ public String windowSizeMustBePowerOf2;

  460. 	/***/ public String writeTimedOut;

  461. 	/***/ public String writerAlreadyInitialized;

  462. 	/***/ public String writingNotPermitted;

  463. 	/***/ public String writingNotSupported;

  464. 	/***/ public String writingObjects;

  465. 	/***/ public String wrongDecompressedLength;

  466. }