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.

JGitText.properties 31KB

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
Merging Git notes Merging Git notes branches has several differences from merging "normal" branches. Although Git notes are initially stored as one flat tree the tree may fanout when the number of notes becomes too large for efficient access. In this case the first two hex digits of the note name will be used as a subdirectory name and the rest 38 hex digits as the file name under that directory. Similarly, when number of notes decreases a fanout tree may collapse back into a flat tree. The Git notes merge algorithm must take into account possibly different tree structures in different note branches and must properly match them against each other. Any conflict on a Git note is, by default, resolved by concatenating the two conflicting versions of the note. A delete-edit conflict is, by default, resolved by keeping the edit version. The note merge logic is pluggable and the caller may provide custom note merger that will perform different merging strategy. Additionally, it is possible to have non-note entries inside a notes tree. The merge algorithm must also take this fact into account and will try to merge such non-note entries. However, in case of any merge conflicts the merge operation will fail. Git notes merge algorithm is currently not trying to do content merge of non-note entries. Thanks to Shawn Pearce for patiently answering my questions related to this topic, giving hints and providing code snippets. Change-Id: I3b2335c76c766fd7ea25752e54087f9b19d69c88 Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
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
maxObjectSizeLimit for receive-pack. ReceivePack (and PackParser) can be configured with the maxObjectSizeLimit in order to prevent users from pushing too large objects to Git. The limit check is applied to all object types although it is most likely that a BLOB will exceed the limit. In all cases the size of the object header is excluded from the object size which is checked against the limit as this is the size of which a BLOB object would take in the working tree when checked out as a file. When an object exceeds the maxObjectSizeLimit the receive-pack will abort immediately. Delta objects (both offset and ref delta) are also checked against the limit. However, for delta objects we will first check the size of the inflated delta block against the maxObjectSizeLimit and abort immediately if it exceeds the limit. In this case we even do not know the exact size of the resolved delta object but we assume it will be larger than the given maxObjectSizeLimit as delta is generally only chosen if the delta can copy more data from the base object than the delta needs to insert or needs to represent the copy ranges. Aborting early, in this case, avoids unnecessary inflating of the (huge) delta block. Unfortunately, it is too expensive (especially for a large delta) to compute SHA-1 of an object that causes the receive-pack to abort. This would decrease the value of this feature whose main purpose is to protect server resources from users pushing huge objects. Therefore we don't report the SHA-1 in the error message. Change-Id: I177ef24553faacda444ed5895e40ac8925ca0d1e Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 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
Increase core.streamFileThreshold default to 50 MiB Projects like org.eclipse.mdt contain large XML files about 6 MiB in size. So does the Android project platform/frameworks/base. Doing a clone of either project with JGit takes forever to checkout the files into the working directory, because delta decompression tends to be very expensive as we need to constantly reposition the base stream for each copy instruction. This can be made worse by a very bad ordering of offsets, possibly due to an XML editor that doesn't preserve the order of elements in the file very well. Increasing the threshold to the same limit PackWriter uses when doing delta compression (50 MiB) permits a default configured JGit to decompress these XML file objects using the faster random-access arrays, rather than re-seeking through an inflate stream, significantly reducing checkout time after a clone. Since this new limit may be dangerously close to the JVM maximum heap size, every allocation attempt is now wrapped in a try/catch so that JGit can degrade by switching to the large object stream mode when the allocation is refused. It will run slower, but the operation will still complete. The large stream mode will run very well for big objects that aren't delta compressed, and is acceptable for delta compressed objects that are using only forward referencing copy instructions. Copies using prior offsets are still going to be horrible, and there is nothing we can do about it except increase core.streamFileThreshold. We might in the future want to consider changing the way the delta generators work in JGit and native C Git to avoid prior offsets once an object reaches a certain size, even if that causes the delta instruction stream to be slightly larger. Unfortunately native C Git won't want to do that until its also able to stream objects rather than malloc them as contiguous blocks. Change-Id: Ief7a3896afce15073e80d3691bed90c6a3897307 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
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
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570
  1. abbreviationLengthMustBeNonNegative=Abbreviation length must not be negative.
  2. abortingRebase=Aborting rebase: resetting to {0}
  3. abortingRebaseFailed=Could not abort rebase
  4. abortingRebaseFailedNoOrigHead=Could not abort rebase since ORIG_HEAD is null
  5. advertisementCameBefore=advertisement of {0}^{} came before {1}
  6. advertisementOfCameBefore=advertisement of {0}^{} came before {1}
  7. amazonS3ActionFailed={0} of ''{1}'' failed: {2} {3}
  8. amazonS3ActionFailedGivingUp={0} of ''{1}'' failed: Giving up after {2} attempts.
  9. ambiguousObjectAbbreviation=Object abbreviation {0} is ambiguous
  10. aNewObjectIdIsRequired=A NewObjectId is required.
  11. anExceptionOccurredWhileTryingToAddTheIdOfHEAD=An exception occurred while trying to add the Id of HEAD
  12. anSSHSessionHasBeenAlreadyCreated=An SSH session has been already created
  13. applyingCommit=Applying {0}
  14. archiveFormatAlreadyAbsent=Archive format already absent: {0}
  15. archiveFormatAlreadyRegistered=Archive format already registered: {0}
  16. argumentIsNotAValidCommentString=Invalid comment: {0}
  17. atLeastOnePathIsRequired=At least one path is required.
  18. atLeastOnePatternIsRequired=At least one pattern is required.
  19. atLeastTwoFiltersNeeded=At least two filters needed.
  20. authenticationNotSupported=authentication not supported
  21. badBase64InputCharacterAt=Bad Base64 input character at {0} : {1} (decimal)
  22. badEntryDelimiter=Bad entry delimiter
  23. badEntryName=Bad entry name: {0}
  24. badEscape=Bad escape: {0}
  25. badGroupHeader=Bad group header
  26. badObjectType=Bad object type: {0}
  27. badSectionEntry=Bad section entry: {0}
  28. bareRepositoryNoWorkdirAndIndex=Bare Repository has neither a working tree, nor an index
  29. base64InputNotProperlyPadded=Base64 input not properly padded.
  30. baseLengthIncorrect=base length incorrect
  31. bitmapMissingObject=Bitmap at {0} is missing {1}.
  32. bitmapsMustBePrepared=Bitmaps must be prepared before they may be written.
  33. blameNotCommittedYet=Not Committed Yet
  34. blobNotFound=Blob not found: {0}
  35. blobNotFoundForPath=Blob not found: {0} for path: {1}
  36. branchNameInvalid=Branch name {0} is not allowed
  37. buildingBitmaps=Building bitmaps
  38. cachedPacksPreventsIndexCreation=Using cached packs prevents index creation
  39. cachedPacksPreventsListingObjects=Using cached packs prevents listing objects
  40. cannotBeCombined=Cannot be combined.
  41. cannotBeRecursiveWhenTreesAreIncluded=TreeWalk shouldn't be recursive when tree objects are included.
  42. cannotChangeActionOnComment=Cannot change action on comment line in git-rebase-todo file, old action: {0}, new action: {1}.
  43. cannotChangeToComment=Cannot change a non-comment line to a comment line.
  44. cannotCombineSquashWithNoff=Cannot combine --squash with --no-ff.
  45. cannotCombineTreeFilterWithRevFilter=Cannot combine TreeFilter {0} with RevFilter {1}.
  46. cannotCommitOnARepoWithState=Cannot commit on a repo with state: {0}
  47. cannotCommitWriteTo=Cannot commit write to {0}
  48. cannotConnectPipes=cannot connect pipes
  49. cannotConvertScriptToText=Cannot convert script to text
  50. cannotCreateConfig=cannot create config
  51. cannotCreateDirectory=Cannot create directory {0}
  52. cannotCreateHEAD=cannot create HEAD
  53. cannotCreateIndexfile=Cannot create an index file with name {0}
  54. cannotDeleteCheckedOutBranch=Branch {0} is checked out and can not be deleted
  55. cannotDeleteFile=Cannot delete file: {0}
  56. cannotDeleteStaleTrackingRef=Cannot delete stale tracking ref {0}
  57. cannotDeleteStaleTrackingRef2=Cannot delete stale tracking ref {0}: {1}
  58. cannotDetermineProxyFor=Cannot determine proxy for {0}
  59. cannotDownload=Cannot download {0}
  60. cannotExecute=cannot execute: {0}
  61. cannotGet=Cannot get {0}
  62. cannotListRefs=cannot list refs
  63. cannotLock=Cannot lock {0}
  64. cannotLockPackIn=Cannot lock pack in {0}
  65. cannotMatchOnEmptyString=Cannot match on empty string.
  66. cannotMoveIndexTo=Cannot move index to {0}
  67. cannotMovePackTo=Cannot move pack to {0}
  68. cannotOpenService=cannot open {0}
  69. cannotParseDate=The date specification "{0}" could not be parsed with the following formats: {1}
  70. cannotParseGitURIish=Cannot parse Git URI-ish
  71. cannotPullOnARepoWithState=Cannot pull into a repository with state: {0}
  72. cannotRead=Cannot read {0}
  73. cannotReadBlob=Cannot read blob {0}
  74. cannotReadCommit=Cannot read commit {0}
  75. cannotReadFile=Cannot read file {0}
  76. cannotReadHEAD=cannot read HEAD: {0} {1}
  77. cannotReadObject=Cannot read object
  78. cannotReadTree=Cannot read tree {0}
  79. cannotRebaseWithoutCurrentHead=Can not rebase without a current HEAD
  80. cannotResolveLocalTrackingRefForUpdating=Cannot resolve local tracking ref {0} for updating.
  81. cannotSquashFixupWithoutPreviousCommit=Cannot {0} without previous commit.
  82. cannotStoreObjects=cannot store objects
  83. cannotUnloadAModifiedTree=Cannot unload a modified tree.
  84. cannotWorkWithOtherStagesThanZeroRightNow=Cannot work with other stages than zero right now. Won't write corrupt index.
  85. canOnlyCherryPickCommitsWithOneParent=Cannot cherry-pick commit ''{0}'' because it has {1} parents, only commits with exactly one parent are supported.
  86. canOnlyRevertCommitsWithOneParent=Cannot revert commit ''{0}'' because it has {1} parents, only commits with exactly one parent are supported
  87. cantFindObjectInReversePackIndexForTheSpecifiedOffset=Can't find object in (reverse) pack index for the specified offset {0}
  88. cantPassMeATree=Can't pass me a tree!
  89. channelMustBeInRange0_255=channel {0} must be in range [0, 255]
  90. characterClassIsNotSupported=The character class {0} is not supported.
  91. checkoutConflictWithFile=Checkout conflict with file: {0}
  92. checkoutConflictWithFiles=Checkout conflict with files: {0}
  93. checkoutUnexpectedResult=Checkout returned unexpected result {0}
  94. classCastNotA=Not a {0}
  95. cloneNonEmptyDirectory=Destination path "{0}" already exists and is not an empty directory
  96. collisionOn=Collision on {0}
  97. commandWasCalledInTheWrongState=Command {0} was called in the wrong state
  98. commitAlreadyExists=exists {0}
  99. commitMessageNotSpecified=commit message not specified
  100. commitOnRepoWithoutHEADCurrentlyNotSupported=Commit on repo without HEAD currently not supported
  101. commitAmendOnInitialNotPossible=Amending is not possible on initial commit.
  102. compressingObjects=Compressing objects
  103. connectionFailed=connection failed
  104. connectionTimeOut=Connection time out: {0}
  105. contextMustBeNonNegative=context must be >= 0
  106. corruptionDetectedReReadingAt=Corruption detected re-reading at {0}
  107. corruptObjectBadStream=bad stream
  108. corruptObjectBadStreamCorruptHeader=bad stream, corrupt header
  109. corruptObjectGarbageAfterSize=garbage after size
  110. corruptObjectIncorrectLength=incorrect length
  111. corruptObjectInvalidEntryMode=invalid entry mode
  112. corruptObjectInvalidMode=invalid mode
  113. corruptObjectInvalidMode2=invalid mode {0}
  114. corruptObjectInvalidMode3=invalid mode {0} for {1} ''{2}'' in {3}.
  115. corruptObjectInvalidType=invalid type
  116. corruptObjectInvalidType2=invalid type {0}
  117. corruptObjectMalformedHeader=malformed header: {0}
  118. corruptObjectNegativeSize=negative size
  119. corruptObjectNoAuthor=no author
  120. corruptObjectNoCommitter=no committer
  121. corruptObjectNoHeader=no header
  122. corruptObjectNoObject=no object
  123. corruptObjectNoTaggerBadHeader=no tagger/bad header
  124. corruptObjectNoTaggerHeader=no tagger header
  125. corruptObjectNoTagName=no tag name
  126. corruptObjectNotree=no tree
  127. corruptObjectNoType=no type
  128. corruptObjectPackfileChecksumIncorrect=Packfile checksum incorrect.
  129. couldNotCheckOutBecauseOfConflicts=Could not check out because of conflicts
  130. couldNotDeleteLockFileShouldNotHappen=Could not delete lock file. Should not happen
  131. couldNotDeleteTemporaryIndexFileShouldNotHappen=Could not delete temporary index file. Should not happen
  132. couldNotGetAdvertisedRef=Could not get advertised Ref for branch {0}
  133. couldNotGetRepoStatistics=Could not get repository statistics
  134. couldNotLockHEAD=Could not lock HEAD
  135. couldNotReadIndexInOneGo=Could not read index in one go, only {0} out of {1} read
  136. couldNotReadObjectWhileParsingCommit=Could not read an object while parsing commit {0}
  137. couldNotRenameDeleteOldIndex=Could not rename delete old index
  138. couldNotRenameTemporaryFile=Could not rename temporary file {0} to new location {1}
  139. couldNotRenameTemporaryIndexFileToIndex=Could not rename temporary index file to index
  140. couldNotURLEncodeToUTF8=Could not URL encode to UTF-8
  141. couldNotWriteFile=Could not write file {0}
  142. countingObjects=Counting objects
  143. createBranchFailedUnknownReason=Create branch failed for unknown reason
  144. createBranchUnexpectedResult=Create branch returned unexpected result {0}
  145. createNewFileFailed=Could not create new file {0}
  146. credentialPassword=Password
  147. credentialUsername=Username
  148. daemonAlreadyRunning=Daemon already running
  149. daysAgo={0} days ago
  150. deleteBranchUnexpectedResult=Delete branch returned unexpected result {0}
  151. deleteFileFailed=Could not delete file {0}
  152. deleteTagUnexpectedResult=Delete tag returned unexpected result {0}
  153. deletingNotSupported=Deleting {0} not supported.
  154. destinationIsNotAWildcard=Destination is not a wildcard.
  155. detachedHeadDetected=HEAD is detached
  156. dirCacheDoesNotHaveABackingFile=DirCache does not have a backing file
  157. dirCacheFileIsNotLocked=DirCache {0} not locked
  158. dirCacheIsNotLocked=DirCache is not locked
  159. DIRCChecksumMismatch=DIRC checksum mismatch
  160. DIRCExtensionIsTooLargeAt=DIRC extension {0} is too large at {1} bytes.
  161. DIRCExtensionNotSupportedByThisVersion=DIRC extension {0} not supported by this version.
  162. DIRCHasTooManyEntries=DIRC has too many entries.
  163. DIRCUnrecognizedExtendedFlags=Unrecognized extended flags: {0}
  164. dirtyFilesExist=Dirty files exist. Refusing to merge
  165. doesNotHandleMode=Does not handle mode {0} ({1})
  166. downloadCancelled=Download cancelled
  167. downloadCancelledDuringIndexing=Download cancelled during indexing
  168. duplicateAdvertisementsOf=duplicate advertisements of {0}
  169. duplicateRef=Duplicate ref: {0}
  170. duplicateRemoteRefUpdateIsIllegal=Duplicate remote ref update is illegal. Affected remote name: {0}
  171. duplicateStagesNotAllowed=Duplicate stages not allowed
  172. eitherGitDirOrWorkTreeRequired=One of setGitDir or setWorkTree must be called.
  173. emptyCommit=No changes
  174. emptyPathNotPermitted=Empty path not permitted.
  175. encryptionError=Encryption error: {0}
  176. endOfFileInEscape=End of file in escape
  177. entryNotFoundByPath=Entry not found by path: {0}
  178. enumValueNotSupported2=Invalid value: {0}.{1}={2}
  179. enumValueNotSupported3=Invalid value: {0}.{1}.{2}={3}
  180. enumValuesNotAvailable=Enumerated values of type {0} not available
  181. errorDecodingFromFile=Error decoding from file {0}
  182. errorEncodingFromFile=Error encoding from file {0}
  183. errorInBase64CodeReadingStream=Error in Base64 code reading stream.
  184. errorInPackedRefs=error in packed-refs
  185. errorInvalidProtocolWantedOldNewRef=error: invalid protocol: wanted 'old new ref'
  186. errorListing=Error listing {0}
  187. errorOccurredDuringUnpackingOnTheRemoteEnd=error occurred during unpacking on the remote end: {0}
  188. errorReadingInfoRefs=error reading info/refs
  189. errorSymlinksNotSupported=Symlinks are not supported with this OS/JRE
  190. exceptionCaughtDuringExecutionOfAddCommand=Exception caught during execution of add command
  191. exceptionCaughtDuringExecutionOfArchiveCommand=Exception caught during execution of archive command
  192. exceptionCaughtDuringExecutionOfCherryPickCommand=Exception caught during execution of cherry-pick command. {0}
  193. exceptionCaughtDuringExecutionOfCommitCommand=Exception caught during execution of commit command
  194. exceptionCaughtDuringExecutionOfFetchCommand=Exception caught during execution of fetch command
  195. exceptionCaughtDuringExecutionOfLsRemoteCommand=Exception caught during execution of ls-remote command
  196. exceptionCaughtDuringExecutionOfMergeCommand=Exception caught during execution of merge command. {0}
  197. exceptionCaughtDuringExecutionOfPullCommand=Exception caught during execution of pull command
  198. exceptionCaughtDuringExecutionOfPushCommand=Exception caught during execution of push command
  199. exceptionCaughtDuringExecutionOfResetCommand=Exception caught during execution of reset command. {0}
  200. exceptionCaughtDuringExecutionOfRevertCommand=Exception caught during execution of revert command. {0}
  201. exceptionCaughtDuringExecutionOfRmCommand=Exception caught during execution of rm command
  202. exceptionCaughtDuringExecutionOfTagCommand=Exception caught during execution of tag command
  203. exceptionOccurredDuringAddingOfOptionToALogCommand=Exception occurred during adding of {0} as option to a Log command
  204. exceptionOccurredDuringReadingOfGIT_DIR=Exception occurred during reading of $GIT_DIR/{0}. {1}
  205. expectedACKNAKFoundEOF=Expected ACK/NAK, found EOF
  206. expectedACKNAKGot=Expected ACK/NAK, got: {0}
  207. expectedBooleanStringValue=Expected boolean string value
  208. expectedCharacterEncodingGuesses=Expected {0} character encoding guesses
  209. expectedEOFReceived=expected EOF; received ''{0}'' instead
  210. expectedGot=expected ''{0}'', got ''{1}''
  211. expectedLessThanGot=expected less than ''{0}'', got ''{1}''
  212. expectedPktLineWithService=expected pkt-line with '# service=-', got ''{0}''
  213. expectedReceivedContentType=expected Content-Type {0}; received Content-Type {1}
  214. expectedReportForRefNotReceived={0}: expected report for ref {1} not received
  215. failedUpdatingRefs=failed updating refs
  216. failureDueToOneOfTheFollowing=Failure due to one of the following:
  217. failureUpdatingFETCH_HEAD=Failure updating FETCH_HEAD: {0}
  218. failureUpdatingTrackingRef=Failure updating tracking ref {0}: {1}
  219. fileCannotBeDeleted=File cannot be deleted: {0}
  220. fileIsTooBigForThisConvenienceMethod=File is too big for this convenience method ({0} bytes).
  221. fileIsTooLarge=File is too large: {0}
  222. fileModeNotSetForPath=FileMode not set for path {0}
  223. flagIsDisposed={0} is disposed.
  224. flagNotFromThis={0} not from this.
  225. flagsAlreadyCreated={0} flags already created.
  226. funnyRefname=funny refname
  227. gcFailed=Garbage collection failed.
  228. gitmodulesNotFound=.gitmodules not found in tree.
  229. headRequiredToStash=HEAD required to stash local changes
  230. hoursAgo={0} hours ago
  231. hugeIndexesAreNotSupportedByJgitYet=Huge indexes are not supported by jgit, yet
  232. hunkBelongsToAnotherFile=Hunk belongs to another file
  233. hunkDisconnectedFromFile=Hunk disconnected from file
  234. hunkHeaderDoesNotMatchBodyLineCountOf=Hunk header {0} does not match body line count of {1}
  235. illegalArgumentNotA=Not {0}
  236. illegalCombinationOfArguments=The combination of arguments {0} and {1} is not allowed
  237. illegalPackingPhase=Illegal packing phase {0}
  238. illegalStateExists=exists {0}
  239. improperlyPaddedBase64Input=Improperly padded Base64 input.
  240. incorrectHashFor=Incorrect hash for {0}; computed {1} as a {2} from {3} bytes.
  241. incorrectOBJECT_ID_LENGTH=Incorrect OBJECT_ID_LENGTH.
  242. indexFileIsInUse=Index file is in use
  243. indexFileIsTooLargeForJgit=Index file is too large for jgit
  244. indexSignatureIsInvalid=Index signature is invalid: {0}
  245. indexWriteException=Modified index could not be written
  246. inMemoryBufferLimitExceeded=In-memory buffer limit exceeded
  247. inputStreamMustSupportMark=InputStream must support mark()
  248. integerValueOutOfRange=Integer value {0}.{1} out of range
  249. internalRevisionError=internal revision error
  250. internalServerError=internal server error
  251. interruptedWriting=Interrupted writing {0}
  252. inTheFuture=in the future
  253. invalidAdvertisementOf=invalid advertisement of {0}
  254. invalidAncestryLength=Invalid ancestry length
  255. invalidBooleanValue=Invalid boolean value: {0}.{1}={2}
  256. invalidChannel=Invalid channel {0}
  257. invalidCharacterInBase64Data=Invalid character in Base64 data.
  258. invalidCommitParentNumber=Invalid commit parent number
  259. invalidEncryption=Invalid encryption
  260. invalidGitdirRef = Invalid .git reference in file ''{0}''
  261. invalidGitType=invalid git type: {0}
  262. invalidId=Invalid id {0}
  263. invalidIdLength=Invalid id length {0}; should be {1}
  264. invalidIntegerValue=Invalid integer value: {0}.{1}={2}
  265. invalidKey=Invalid key: {0}
  266. invalidLineInConfigFile=Invalid line in config file
  267. invalidModeFor=Invalid mode {0} for {1} {2} in {3}.
  268. invalidModeForPath=Invalid mode {0} for path {1}
  269. invalidObject=Invalid {0} {1}:{2}
  270. invalidOldIdSent=invalid old id sent
  271. invalidPacketLineHeader=Invalid packet line header: {0}
  272. invalidPath=Invalid path: {0}
  273. invalidPathContainsSeparator=Invalid path (contains separator ''{0}''): {1}
  274. invalidPathPeriodAtEndWindows=Invalid path (period at end is ignored by Windows): {0}
  275. invalidPathSpaceAtEndWindows=Invalid path (space at end is ignored by Windows): {0}
  276. invalidPathReservedOnWindows=Invalid path (''{0}'' is reserved on Windows): {1}
  277. invalidReflogRevision=Invalid reflog revision: {0}
  278. invalidRefName=Invalid ref name: {0}
  279. invalidRemote=Invalid remote: {0}
  280. invalidStageForPath=Invalid stage {0} for path {1}
  281. invalidTagOption=Invalid tag option: {0}
  282. invalidTimeout=Invalid timeout: {0}
  283. invalidURL=Invalid URL {0}
  284. invalidWildcards=Invalid wildcards {0}
  285. invalidRefSpec=Invalid refspec {0}
  286. invalidWindowSize=Invalid window size
  287. isAStaticFlagAndHasNorevWalkInstance={0} is a static flag and has no RevWalk instance
  288. JRELacksMD5Implementation=JRE lacks MD5 implementation
  289. kNotInRange=k {0} not in {1} - {2}
  290. largeObjectExceedsByteArray=Object {0} exceeds 2 GiB byte array limit
  291. largeObjectExceedsLimit=Object {0} exceeds {1} limit, actual size is {2}
  292. largeObjectException={0} exceeds size limit
  293. largeObjectOutOfMemory=Out of memory loading {0}
  294. lengthExceedsMaximumArraySize=Length exceeds maximum array size
  295. listingAlternates=Listing alternates
  296. localObjectsIncomplete=Local objects incomplete.
  297. localRefIsMissingObjects=Local ref {0} is missing object(s).
  298. lockCountMustBeGreaterOrEqual1=lockCount must be >= 1
  299. lockError=lock error: {0}
  300. lockOnNotClosed=Lock on {0} not closed.
  301. lockOnNotHeld=Lock on {0} not held.
  302. malformedpersonIdentString=Malformed PersonIdent string (no < was found): {0}
  303. maxCountMustBeNonNegative=max count must be >= 0
  304. mergeConflictOnNonNoteEntries=Merge conflict on non-note entries: base = {0}, ours = {1}, theirs = {2}
  305. mergeConflictOnNotes=Merge conflict on note {0}. base = {1}, ours = {2}, theirs = {2}
  306. mergeStrategyAlreadyExistsAsDefault=Merge strategy "{0}" already exists as a default strategy
  307. mergeStrategyDoesNotSupportHeads=merge strategy {0} does not support {1} heads to be merged into HEAD
  308. mergeUsingStrategyResultedInDescription=Merge of revisions {0} with base {1} using strategy {2} resulted in: {3}. {4}
  309. mergeRecursiveReturnedNoCommit=Merge returned no commit:\n Depth {0}\n Head one {1}\n Head two {2}
  310. mergeRecursiveTooManyMergeBasesFor = "More than {0} merge bases for:\n a {1}\n b {2} found:\n count {3}"
  311. messageAndTaggerNotAllowedInUnannotatedTags = Unannotated tags cannot have a message or tagger
  312. minutesAgo={0} minutes ago
  313. missingAccesskey=Missing accesskey.
  314. missingConfigurationForKey=No value for key {0} found in configuration
  315. missingDeltaBase=delta base
  316. missingForwardImageInGITBinaryPatch=Missing forward-image in GIT binary patch
  317. missingObject=Missing {0} {1}
  318. missingPrerequisiteCommits=missing prerequisite commits:
  319. missingRequiredParameter=Parameter "{0}" is missing
  320. missingSecretkey=Missing secretkey.
  321. mixedStagesNotAllowed=Mixed stages not allowed
  322. mkDirFailed=Creating directory {0} failed
  323. mkDirsFailed=Creating directories for {0} failed
  324. month=month
  325. months=months
  326. monthsAgo={0} months ago
  327. multipleMergeBasesFor=Multiple merge bases for:\n {0}\n {1} found:\n {2}\n {3}
  328. need2Arguments=Need 2 arguments
  329. needPackOut=need packOut
  330. needsAtLeastOneEntry=Needs at least one entry
  331. needsWorkdir=Needs workdir
  332. newlineInQuotesNotAllowed=Newline in quotes not allowed
  333. noApplyInDelete=No apply in delete
  334. noClosingBracket=No closing {0} found for {1} at index {2}.
  335. noHEADExistsAndNoExplicitStartingRevisionWasSpecified=No HEAD exists and no explicit starting revision was specified
  336. noHMACsupport=No {0} support: {1}
  337. noMergeBase=No merge base could be determined. Reason={0}. {1}
  338. noMergeHeadSpecified=No merge head specified
  339. noSuchRef=no such ref
  340. notABoolean=Not a boolean: {0}
  341. notABundle=not a bundle
  342. notADIRCFile=Not a DIRC file.
  343. notAGitDirectory=not a git directory
  344. notAPACKFile=Not a PACK file.
  345. notARef=Not a ref: {0}: {1}
  346. notASCIIString=Not ASCII string: {0}
  347. notAuthorized=not authorized
  348. notAValidPack=Not a valid pack {0}
  349. notFound=not found.
  350. nothingToFetch=Nothing to fetch.
  351. nothingToPush=Nothing to push.
  352. notMergedExceptionMessage=Branch was not deleted as it has not been merged yet; use the force option to delete it anyway
  353. noXMLParserAvailable=No XML parser available.
  354. objectAtHasBadZlibStream=Object at {0} in {1} has bad zlib stream
  355. objectAtPathDoesNotHaveId=Object at path "{0}" does not have an id assigned. All object ids must be assigned prior to writing a tree.
  356. objectIsCorrupt=Object {0} is corrupt: {1}
  357. objectIsNotA=Object {0} is not a {1}.
  358. objectNotFound=Object {0} not found.
  359. objectNotFoundIn=Object {0} not found in {1}.
  360. obtainingCommitsForCherryPick=Obtaining commits that need to be cherry-picked
  361. offsetWrittenDeltaBaseForObjectNotFoundInAPack=Offset-written delta base for object not found in a pack
  362. onlyAlreadyUpToDateAndFastForwardMergesAreAvailable=only already-up-to-date and fast forward merges are available
  363. onlyOneFetchSupported=Only one fetch supported
  364. onlyOneOperationCallPerConnectionIsSupported=Only one operation call per connection is supported.
  365. openFilesMustBeAtLeast1=Open files must be >= 1
  366. openingConnection=Opening connection
  367. operationCanceled=Operation {0} was canceled
  368. outputHasAlreadyBeenStarted=Output has already been started.
  369. packChecksumMismatch=Pack checksum mismatch
  370. packCorruptedWhileWritingToFilesystem=Pack corrupted while writing to filesystem
  371. packDoesNotMatchIndex=Pack {0} does not match index
  372. packetSizeMustBeAtLeast=packet size {0} must be >= {1}
  373. packetSizeMustBeAtMost=packet size {0} must be <= {1}
  374. packfileCorruptionDetected=Packfile corruption detected: {0}
  375. packFileInvalid=Pack file invalid: {0}
  376. packfileIsTruncated=Packfile is truncated.
  377. packHasUnresolvedDeltas=pack has unresolved deltas
  378. packingCancelledDuringObjectsWriting=Packing cancelled during objects writing
  379. packObjectCountMismatch=Pack object count mismatch: pack {0} index {1}: {2}
  380. packRefs=Pack refs
  381. packTooLargeForIndexVersion1=Pack too large for index version 1
  382. packWriterStatistics=Total {0,number,#0} (delta {1,number,#0}), reused {2,number,#0} (delta {3,number,#0})
  383. panicCantRenameIndexFile=Panic: index file {0} must be renamed to replace {1}; until then repository is corrupt
  384. patchApplyException=Cannot apply: {0}
  385. patchFormatException=Format error: {0}
  386. pathIsNotInWorkingDir=Path is not in working dir
  387. pathNotConfigured=Submodule path is not configured
  388. peeledLineBeforeRef=Peeled line before ref.
  389. peerDidNotSupplyACompleteObjectGraph=peer did not supply a complete object graph
  390. prefixRemote=remote:
  391. problemWithResolvingPushRefSpecsLocally=Problem with resolving push ref specs locally: {0}
  392. progressMonUploading=Uploading {0}
  393. propertyIsAlreadyNonNull=Property is already non null
  394. pruneLoosePackedObjects=Prune loose objects also found in pack files
  395. pruneLooseUnreferencedObjects=Prune loose, unreferenced objects
  396. pullOnRepoWithoutHEADCurrentlyNotSupported=Pull on repository without HEAD currently not supported
  397. pullTaskName=Pull
  398. pushCancelled=push cancelled
  399. pushIsNotSupportedForBundleTransport=Push is not supported for bundle transport
  400. pushNotPermitted=push not permitted
  401. rawLogMessageDoesNotParseAsLogEntry=Raw log message does not parse as log entry
  402. readingObjectsFromLocalRepositoryFailed=reading objects from local repository failed: {0}
  403. readTimedOut=Read timed out after {0} ms
  404. receivePackObjectTooLarge1=Object too large, rejecting the pack. Max object size limit is {0} bytes.
  405. receivePackObjectTooLarge2=Object too large ({0} bytes), rejecting the pack. Max object size limit is {1} bytes.
  406. receivingObjects=Receiving objects
  407. refAlreadyExists=already exists
  408. refAlreadyExists1=Ref {0} already exists
  409. reflogEntryNotFound=Entry {0} not found in reflog for ''{1}''
  410. refNotResolved=Ref {0} can not be resolved
  411. refUpdateReturnCodeWas=RefUpdate return code was: {0}
  412. remoteConfigHasNoURIAssociated=Remote config "{0}" has no URIs associated
  413. remoteDoesNotHaveSpec=Remote does not have {0} available for fetch.
  414. remoteDoesNotSupportSmartHTTPPush=remote does not support smart HTTP push
  415. remoteHungUpUnexpectedly=remote hung up unexpectedly
  416. remoteNameCantBeNull=Remote name can't be null.
  417. renameBranchFailedBecauseTag=Can not rename as Ref {0} is a tag
  418. renameBranchFailedUnknownReason=Rename failed with unknown reason
  419. renameBranchUnexpectedResult=Unexpected rename result {0}
  420. renameFileFailed=Could not rename file {0} to {1}
  421. renamesAlreadyFound=Renames have already been found.
  422. renamesBreakingModifies=Breaking apart modified file pairs
  423. renamesFindingByContent=Finding renames by content similarity
  424. renamesFindingExact=Finding exact renames
  425. renamesRejoiningModifies=Rejoining modified file pairs
  426. repositoryAlreadyExists=Repository already exists: {0}
  427. repositoryConfigFileInvalid=Repository config file {0} invalid {1}
  428. repositoryIsRequired=Repository is required.
  429. repositoryNotFound=repository not found: {0}
  430. repositoryState_applyMailbox=Apply mailbox
  431. repositoryState_bisecting=Bisecting
  432. repositoryState_conflicts=Conflicts
  433. repositoryState_merged=Merged
  434. repositoryState_normal=Normal
  435. repositoryState_rebase=Rebase
  436. repositoryState_rebaseInteractive=Rebase interactive
  437. repositoryState_rebaseOrApplyMailbox=Rebase/Apply mailbox
  438. repositoryState_rebaseWithMerge=Rebase w/merge
  439. requiredHashFunctionNotAvailable=Required hash function {0} not available.
  440. resettingHead=Resetting head to {0}
  441. resolvingDeltas=Resolving deltas
  442. resultLengthIncorrect=result length incorrect
  443. rewinding=Rewinding to commit {0}
  444. searchForReuse=Finding sources
  445. searchForSizes=Getting sizes
  446. secondsAgo={0} seconds ago
  447. selectingCommits=Selecting commits
  448. sequenceTooLargeForDiffAlgorithm=Sequence too large for difference algorithm.
  449. serviceNotEnabledNoName=Service not enabled
  450. serviceNotPermitted={0} not permitted
  451. serviceNotPermittedNoName=Service not permitted
  452. shallowCommitsAlreadyInitialized=Shallow commits have already been initialized
  453. shortCompressedStreamAt=Short compressed stream at {0}
  454. shortReadOfBlock=Short read of block.
  455. shortReadOfOptionalDIRCExtensionExpectedAnotherBytes=Short read of optional DIRC extension {0}; expected another {1} bytes within the section.
  456. shortSkipOfBlock=Short skip of block.
  457. signingNotSupportedOnTag=Signing isn't supported on tag operations yet.
  458. similarityScoreMustBeWithinBounds=Similarity score must be between 0 and 100.
  459. sizeExceeds2GB=Path {0} size {1} exceeds 2 GiB limit.
  460. skipMustBeNonNegative=skip must be >= 0
  461. smartHTTPPushDisabled=smart HTTP push disabled
  462. sourceDestinationMustMatch=Source/Destination must match.
  463. sourceIsNotAWildcard=Source is not a wildcard.
  464. sourceRefDoesntResolveToAnyObject=Source ref {0} doesn't resolve to any object.
  465. sourceRefNotSpecifiedForRefspec=Source ref not specified for refspec: {0}
  466. squashCommitNotUpdatingHEAD=Squash commit -- not updating HEAD
  467. staleRevFlagsOn=Stale RevFlags on {0}
  468. startingReadStageWithoutWrittenRequestDataPendingIsNotSupported=Starting read stage without written request data pending is not supported
  469. stashApplyConflict=Applying stashed changes resulted in a conflict
  470. stashApplyConflictInIndex=Applying stashed index changes resulted in a conflict. Dropped index changes.
  471. stashApplyFailed=Applying stashed changes did not successfully complete
  472. stashApplyOnUnsafeRepository=Cannot apply stashed commit on a repository with state: {0}
  473. stashApplyWithoutHead=Cannot apply stashed commit in an empty repository or onto an unborn branch
  474. stashCommitMissingTwoParents=Stashed commit ''{0}'' does not have two parent commits
  475. stashDropDeleteRefFailed=Deleting stash reference failed with result: {0}
  476. stashDropFailed=Dropping stashed commit failed
  477. stashDropMissingReflog=Stash reflog does not contain entry ''{0}''
  478. stashFailed=Stashing local changes did not successfully complete
  479. stashResolveFailed=Reference ''{0}'' does not resolve to stashed commit
  480. statelessRPCRequiresOptionToBeEnabled=stateless RPC requires {0} to be enabled
  481. submoduleExists=Submodule ''{0}'' already exists in the index
  482. submoduleParentRemoteUrlInvalid=Cannot remove segment from remote url ''{0}''
  483. submodulesNotSupported=Submodules are not supported
  484. symlinkCannotBeWrittenAsTheLinkTarget=Symlink "{0}" cannot be written as the link target cannot be read from within Java.
  485. systemConfigFileInvalid=Systen wide config file {0} is invalid {1}
  486. tagAlreadyExists=tag ''{0}'' already exists
  487. tagNameInvalid=tag name {0} is invalid
  488. tagOnRepoWithoutHEADCurrentlyNotSupported=Tag on repository without HEAD currently not supported
  489. theFactoryMustNotBeNull=The factory must not be null
  490. timerAlreadyTerminated=Timer already terminated
  491. topologicalSortRequired=Topological sort required.
  492. transportExceptionBadRef=Empty ref: {0}: {1}
  493. transportExceptionEmptyRef=Empty ref: {0}
  494. transportExceptionInvalid=Invalid {0} {1}:{2}
  495. transportExceptionMissingAssumed=Missing assumed {0}
  496. transportExceptionReadRef=read {0}
  497. transportNeedsRepository=Transport needs repository
  498. transportProtoAmazonS3=Amazon S3
  499. transportProtoBundleFile=Git Bundle File
  500. transportProtoFTP=FTP
  501. transportProtoGitAnon=Anonymous Git
  502. transportProtoHTTP=HTTP
  503. transportProtoLocal=Local Git Repository
  504. transportProtoSFTP=SFTP
  505. transportProtoSSH=SSH
  506. treeEntryAlreadyExists=Tree entry "{0}" already exists.
  507. treeFilterMarkerTooManyFilters=Too many markTreeFilters passed, maximum number is {0} (passed {1})
  508. treeIteratorDoesNotSupportRemove=TreeIterator does not support remove()
  509. treeWalkMustHaveExactlyTwoTrees=TreeWalk should have exactly two trees.
  510. truncatedHunkLinesMissingForAncestor=Truncated hunk, at least {0} lines missing for ancestor {1}
  511. truncatedHunkNewLinesMissing=Truncated hunk, at least {0} new lines is missing
  512. truncatedHunkOldLinesMissing=Truncated hunk, at least {0} old lines is missing
  513. tSizeMustBeGreaterOrEqual1=tSize must be >= 1
  514. unableToCheckConnectivity=Unable to check connectivity.
  515. unableToStore=Unable to store {0}.
  516. unableToWrite=Unable to write {0}
  517. unencodeableFile=Unencodeable file: {0}
  518. unexpectedCompareResult=Unexpected metadata comparison result: {0}
  519. unexpectedEndOfConfigFile=Unexpected end of config file
  520. unexpectedHunkTrailer=Unexpected hunk trailer
  521. unexpectedOddResult=odd: {0} + {1} - {2}
  522. unexpectedRefReport={0}: unexpected ref report: {1}
  523. unexpectedReportLine=unexpected report line: {0}
  524. unexpectedReportLine2={0} unexpected report line: {1}
  525. unknownOrUnsupportedCommand=Unknown or unsupported command "{0}", only "{1}" is allowed.
  526. unknownDIRCVersion=Unknown DIRC version {0}
  527. unknownHost=unknown host
  528. unknownIndexVersionOrCorruptIndex=Unknown index version (or corrupt index): {0}
  529. unknownObject=unknown object
  530. unknownObjectType=Unknown object type {0}.
  531. unknownRepositoryFormat=Unknown repository format
  532. unknownRepositoryFormat2=Unknown repository format "{0}"; expected "0".
  533. unknownZlibError=Unknown zlib error.
  534. unmergedPath=Unmerged path: {0}
  535. unmergedPaths=Repository contains unmerged paths
  536. unpackException=Exception while parsing pack stream
  537. unreadablePackIndex=Unreadable pack index: {0}
  538. unrecognizedRef=Unrecognized ref: {0}
  539. unsupportedArchiveFormat=Unknown archive format ''{0}''
  540. unsupportedCommand0=unsupported command 0
  541. unsupportedEncryptionAlgorithm=Unsupported encryption algorithm: {0}
  542. unsupportedEncryptionVersion=Unsupported encryption version: {0}
  543. unsupportedGC Unsupported garbage collector for repository type: {0}
  544. unsupportedOperationNotAddAtEnd=Not add-at-end: {0}
  545. unsupportedPackIndexVersion=Unsupported pack index version {0}
  546. unsupportedPackVersion=Unsupported pack version {0}.
  547. updatingReferences=Updating references
  548. updatingRefFailed=Updating the ref {0} to {1} failed. ReturnCode from RefUpdate.update() was {2}
  549. uriNotConfigured=Submodule URI not configured
  550. uriNotFound={0} not found
  551. URINotSupported=URI not supported: {0}
  552. URLNotFound={0} not found
  553. userConfigFileInvalid=User config file {0} invalid {1}
  554. walkFailure=Walk failure.
  555. wantNotValid=want {0} not valid
  556. weeksAgo={0} weeks ago
  557. windowSizeMustBeLesserThanLimit=Window size must be < limit
  558. windowSizeMustBePowerOf2=Window size must be power of 2
  559. writerAlreadyInitialized=Writer already initialized
  560. writeTimedOut=Write timed out after {0} ms
  561. writingNotPermitted=Writing not permitted
  562. writingNotSupported=Writing {0} not supported.
  563. writingObjects=Writing objects
  564. wrongDecompressedLength=wrong decompressed length
  565. wrongRepositoryState=Wrong Repository State: {0}
  566. year=year
  567. years=years
  568. years0MonthsAgo={0} {1} ago
  569. yearsAgo={0} years ago
  570. yearsMonthsAgo={0} {1}, {2} {3} ago