aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2019-09-07 11:07:21 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2019-09-07 12:16:42 +0200
commit38198972d4b3ac26828867317a7daa8bdfb10f4b (patch)
tree33eb494b509adc6b8f6a4cae8fe8fea9c9f825d8 /org.eclipse.jgit/src
parentaa62f191d02c19073c22a5e33e4a07c54a67efa7 (diff)
parente626c55936a6e5a969bb720c26db9e4434c46edc (diff)
downloadjgit-38198972d4b3ac26828867317a7daa8bdfb10f4b.tar.gz
jgit-38198972d4b3ac26828867317a7daa8bdfb10f4b.zip
Merge branch 'stable-5.1' into stable-5.2
* stable-5.1: Bazel: Fix warning about deprecated lib.bzl Format lib/BUILD with buildifier Bazel: Add fixes for --incompatible_load_java_rules_from_bzl Bazel: Bump minimum supported version to 0.29.0 Bazel: Bump skylib library version to 0.8.0 Use bazelisk to switch between used bazel version Bazel: Require minimum bazel version 0.17.1 Fix wrong placeholder index in error message packInaccessible JGitText: Remove unused externalized strings RepoText: Remove unused externalized string CLI: Remove unused externalized strings Change-Id: Iea37a8e39e9d4872dc607c9222dcf191ce4e4757 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/src')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/internal/RepoText.java1
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java64
2 files changed, 0 insertions, 65 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/internal/RepoText.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/internal/RepoText.java
index ccafff667f..9723e5b2fb 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/internal/RepoText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/internal/RepoText.java
@@ -61,7 +61,6 @@ public class RepoText extends TranslationBundle {
}
// @formatter:off
- /***/ public String copyFileFailed;
/***/ public String errorIncludeFile;
/***/ public String errorIncludeNotImplemented;
/***/ public String errorNoDefault;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
index 5bbfe81dff..f65e3746e1 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
@@ -96,13 +96,10 @@ public class JGitText extends TranslationBundle {
/***/ public String badSectionEntry;
/***/ public String badShallowLine;
/***/ public String bareRepositoryNoWorkdirAndIndex;
- /***/ public String base64InputNotProperlyPadded;
/***/ public String baseLengthIncorrect;
/***/ public String bitmapMissingObject;
/***/ public String bitmapsMustBePrepared;
/***/ public String blameNotCommittedYet;
- /***/ public String blobNotFound;
- /***/ public String blobNotFoundForPath;
/***/ public String blockLimitNotMultipleOfBlockSize;
/***/ public String blockLimitNotPositive;
/***/ public String blockSizeNotPowerOf2;
@@ -115,7 +112,6 @@ public class JGitText extends TranslationBundle {
/***/ public String cannotBeCombined;
/***/ public String cannotBeRecursiveWhenTreesAreIncluded;
/***/ public String cannotChangeActionOnComment;
- /***/ public String cannotChangeToComment;
/***/ public String cannotCheckoutFromUnbornBranch;
/***/ public String cannotCheckoutOursSwitchBranch;
/***/ public String cannotCombineSquashWithNoff;
@@ -132,8 +128,6 @@ public class JGitText extends TranslationBundle {
/***/ public String cannotDeleteCheckedOutBranch;
/***/ public String cannotDeleteFile;
/***/ public String cannotDeleteObjectsPath;
- /***/ public String cannotDeleteStaleTrackingRef;
- /***/ public String cannotDeleteStaleTrackingRef2;
/***/ public String cannotDetermineProxyFor;
/***/ public String cannotDownload;
/***/ public String cannotEnterObjectsPath;
@@ -165,20 +159,16 @@ public class JGitText extends TranslationBundle {
/***/ public String cannotReadObjectsPath;
/***/ public String cannotReadTree;
/***/ public String cannotRebaseWithoutCurrentHead;
- /***/ public String cannotResolveLocalTrackingRefForUpdating;
/***/ public String cannotSaveConfig;
/***/ public String cannotSquashFixupWithoutPreviousCommit;
/***/ public String cannotStoreObjects;
/***/ public String cannotResolveUniquelyAbbrevObjectId;
- /***/ public String cannotUnloadAModifiedTree;
/***/ public String cannotUpdateUnbornBranch;
- /***/ public String cannotWorkWithOtherStagesThanZeroRightNow;
/***/ public String cannotWriteObjectsPath;
/***/ public String canOnlyCherryPickCommitsWithOneParent;
/***/ public String canOnlyRevertCommitsWithOneParent;
/***/ public String commitDoesNotHaveGivenParent;
/***/ public String cantFindObjectInReversePackIndexForTheSpecifiedOffset;
- /***/ public String cantPassMeATree;
/***/ public String channelMustBeInRange1_255;
/***/ public String characterClassIsNotSupported;
/***/ public String checkingOutFiles;
@@ -193,7 +183,6 @@ public class JGitText extends TranslationBundle {
/***/ public String commandClosedStderrButDidntExit;
/***/ public String commandRejectedByHook;
/***/ public String commandWasCalledInTheWrongState;
- /***/ public String commitAlreadyExists;
/***/ public String commitMessageNotSpecified;
/***/ public String commitOnRepoWithoutHEADCurrentlyNotSupported;
/***/ public String commitAmendOnInitialNotPossible;
@@ -209,14 +198,11 @@ public class JGitText extends TranslationBundle {
/***/ public String corruptObjectBadDate;
/***/ public String corruptObjectBadEmail;
/***/ public String corruptObjectBadStream;
- /***/ public String corruptObjectBadStreamCorruptHeader;
/***/ public String corruptObjectBadTimezone;
/***/ public String corruptObjectDuplicateEntryNames;
/***/ public String corruptObjectGarbageAfterSize;
/***/ public String corruptObjectIncorrectLength;
/***/ public String corruptObjectIncorrectSorting;
- /***/ public String corruptObjectInvalidEntryMode;
- /***/ public String corruptObjectInvalidMode;
/***/ public String corruptObjectInvalidModeChar;
/***/ public String corruptObjectInvalidModeStartsZero;
/***/ public String corruptObjectInvalidMode2;
@@ -236,7 +222,6 @@ public class JGitText extends TranslationBundle {
/***/ public String corruptObjectInvalidTree;
/***/ public String corruptObjectInvalidType;
/***/ public String corruptObjectInvalidType2;
- /***/ public String corruptObjectMalformedHeader;
/***/ public String corruptObjectMissingEmail;
/***/ public String corruptObjectNameContainsByte;
/***/ public String corruptObjectNameContainsChar;
@@ -249,15 +234,9 @@ public class JGitText extends TranslationBundle {
/***/ public String corruptObjectNoAuthor;
/***/ public String corruptObjectNoCommitter;
/***/ public String corruptObjectNoHeader;
- /***/ public String corruptObjectNoObject;
/***/ public String corruptObjectNoObjectHeader;
- /***/ public String corruptObjectNoTaggerBadHeader;
- /***/ public String corruptObjectNoTaggerHeader;
/***/ public String corruptObjectNoTagHeader;
- /***/ public String corruptObjectNoTagName;
- /***/ public String corruptObjectNotree;
/***/ public String corruptObjectNotreeHeader;
- /***/ public String corruptObjectNoType;
/***/ public String corruptObjectNoTypeHeader;
/***/ public String corruptObjectPackfileChecksumIncorrect;
/***/ public String corruptObjectTruncatedInMode;
@@ -266,20 +245,12 @@ public class JGitText extends TranslationBundle {
/***/ public String corruptObjectZeroId;
/***/ public String corruptPack;
/***/ public String corruptUseCnt;
- /***/ public String couldNotCheckOutBecauseOfConflicts;
- /***/ public String couldNotDeleteLockFileShouldNotHappen;
- /***/ public String couldNotDeleteTemporaryIndexFileShouldNotHappen;
/***/ public String couldNotGetAdvertisedRef;
/***/ public String couldNotGetRepoStatistics;
/***/ public String couldNotLockHEAD;
- /***/ public String couldNotReadIndexInOneGo;
/***/ public String couldNotReadObjectWhileParsingCommit;
- /***/ public String couldNotRenameDeleteOldIndex;
- /***/ public String couldNotRenameTemporaryFile;
- /***/ public String couldNotRenameTemporaryIndexFileToIndex;
/***/ public String couldNotRewindToUpstreamCommit;
/***/ public String couldNotURLEncodeToUTF8;
- /***/ public String couldNotWriteFile;
/***/ public String countingObjects;
/***/ public String createBranchFailedUnknownReason;
/***/ public String createBranchUnexpectedResult;
@@ -306,8 +277,6 @@ public class JGitText extends TranslationBundle {
/***/ public String DIRCExtensionNotSupportedByThisVersion;
/***/ public String DIRCHasTooManyEntries;
/***/ public String DIRCUnrecognizedExtendedFlags;
- /***/ public String dirtyFilesExist;
- /***/ public String doesNotHandleMode;
/***/ public String downloadCancelled;
/***/ public String downloadCancelledDuringIndexing;
/***/ public String duplicateAdvertisementsOf;
@@ -326,9 +295,6 @@ public class JGitText extends TranslationBundle {
/***/ public String enumValueNotSupported2;
/***/ public String enumValueNotSupported3;
/***/ public String enumValuesNotAvailable;
- /***/ public String errorDecodingFromFile;
- /***/ public String errorEncodingFromFile;
- /***/ public String errorInBase64CodeReadingStream;
/***/ public String errorInPackedRefs;
/***/ public String errorInvalidProtocolWantedOldNewRef;
/***/ public String errorListing;
@@ -372,7 +338,6 @@ public class JGitText extends TranslationBundle {
/***/ public String failureUpdatingFETCH_HEAD;
/***/ public String failureUpdatingTrackingRef;
/***/ public String fileCannotBeDeleted;
- /***/ public String fileIsTooBigForThisConvenienceMethod;
/***/ public String fileIsTooLarge;
/***/ public String fileModeNotSetForPath;
/***/ public String filterExecutionFailed;
@@ -384,9 +349,7 @@ public class JGitText extends TranslationBundle {
/***/ public String flagsAlreadyCreated;
/***/ public String funnyRefname;
/***/ public String gcFailed;
- /***/ public String gcLogExists;
/***/ public String gcTooManyUnpruned;
- /***/ public String gitmodulesNotFound;
/***/ public String headRequiredToStash;
/***/ public String hoursAgo;
/***/ public String httpConfigCannotNormalizeURL;
@@ -399,14 +362,10 @@ public class JGitText extends TranslationBundle {
/***/ public String illegalCombinationOfArguments;
/***/ public String illegalHookName;
/***/ public String illegalPackingPhase;
- /***/ public String illegalStateExists;
- /***/ public String improperlyPaddedBase64Input;
/***/ public String incorrectHashFor;
/***/ public String incorrectOBJECT_ID_LENGTH;
/***/ public String indexFileCorruptedNegativeBucketCount;
- /***/ public String indexFileIsInUse;
/***/ public String indexFileIsTooLargeForJgit;
- /***/ public String indexSignatureIsInvalid;
/***/ public String indexWriteException;
/***/ public String initFailedBareRepoDifferentDirs;
/***/ public String initFailedDirIsNoDirectory;
@@ -424,7 +383,6 @@ public class JGitText extends TranslationBundle {
/***/ public String invalidAncestryLength;
/***/ public String invalidBooleanValue;
/***/ public String invalidChannel;
- /***/ public String invalidCharacterInBase64Data;
/***/ public String invalidCommitParentNumber;
/***/ public String invalidDepth;
/***/ public String invalidEncryption;
@@ -449,10 +407,6 @@ public class JGitText extends TranslationBundle {
/***/ public String invalidOldIdSent;
/***/ public String invalidPacketLineHeader;
/***/ public String invalidPath;
- /***/ public String invalidPathContainsSeparator;
- /***/ public String invalidPathPeriodAtEndWindows;
- /***/ public String invalidPathSpaceAtEndWindows;
- /***/ public String invalidPathReservedOnWindows;
/***/ public String invalidPurgeFactor;
/***/ public String invalidRedirectLocation;
/***/ public String invalidRefAdvertisementLine;
@@ -495,7 +449,6 @@ public class JGitText extends TranslationBundle {
/***/ public String lockFailedRetry;
/***/ public String lockOnNotClosed;
/***/ public String lockOnNotHeld;
- /***/ public String malformedpersonIdentString;
/***/ public String maxCountMustBeNonNegative;
/***/ public String mergeConflictOnNonNoteEntries;
/***/ public String mergeConflictOnNotes;
@@ -503,7 +456,6 @@ public class JGitText extends TranslationBundle {
/***/ public String mergeStrategyDoesNotSupportHeads;
/***/ public String mergeUsingStrategyResultedInDescription;
/***/ public String mergeRecursiveConflictsWhenMergingCommonAncestors;
- /***/ public String mergeRecursiveReturnedNoCommit;
/***/ public String mergeRecursiveTooManyMergeBasesFor;
/***/ public String messageAndTaggerNotAllowedInUnannotatedTags;
/***/ public String minutesAgo;
@@ -527,9 +479,6 @@ public class JGitText extends TranslationBundle {
/***/ public String multipleMergeBasesFor;
/***/ public String nameMustNotBeNullOrEmpty;
/***/ public String need2Arguments;
- /***/ public String needPackOut;
- /***/ public String needsAtLeastOneEntry;
- /***/ public String needsWorkdir;
/***/ public String newIdMustNotBeNull;
/***/ public String newlineInQuotesNotAllowed;
/***/ public String noApplyInDelete;
@@ -559,16 +508,13 @@ public class JGitText extends TranslationBundle {
/***/ public String notMergedExceptionMessage;
/***/ public String noXMLParserAvailable;
/***/ public String objectAtHasBadZlibStream;
- /***/ public String objectAtPathDoesNotHaveId;
/***/ public String objectIsCorrupt;
/***/ public String objectIsCorrupt3;
/***/ public String objectIsNotA;
/***/ public String objectNotFound;
/***/ public String objectNotFoundIn;
/***/ public String obtainingCommitsForCherryPick;
- /***/ public String offsetWrittenDeltaBaseForObjectNotFoundInAPack;
/***/ public String oldIdMustNotBeNull;
- /***/ public String onlyAlreadyUpToDateAndFastForwardMergesAreAvailable;
/***/ public String onlyOneFetchSupported;
/***/ public String onlyOneOperationCallPerConnectionIsSupported;
/***/ public String openFilesMustBeAtLeast1;
@@ -578,7 +524,6 @@ public class JGitText extends TranslationBundle {
/***/ public String overflowedReftableBlock;
/***/ public String packChecksumMismatch;
/***/ public String packCorruptedWhileWritingToFilesystem;
- /***/ public String packDoesNotMatchIndex;
/***/ public String packedRefsHandleIsStale;
/***/ public String packetSizeMustBeAtLeast;
/***/ public String packetSizeMustBeAtMost;
@@ -600,7 +545,6 @@ public class JGitText extends TranslationBundle {
/***/ public String panicCantRenameIndexFile;
/***/ public String patchApplyException;
/***/ public String patchFormatException;
- /***/ public String pathIsNotInWorkingDir;
/***/ public String pathNotConfigured;
/***/ public String peeledLineBeforeRef;
/***/ public String peeledRefIsRequired;
@@ -613,7 +557,6 @@ public class JGitText extends TranslationBundle {
/***/ public String propertyIsAlreadyNonNull;
/***/ public String pruneLoosePackedObjects;
/***/ public String pruneLooseUnreferencedObjects;
- /***/ public String pullOnRepoWithoutHEADCurrentlyNotSupported;
/***/ public String pullTaskName;
/***/ public String pushCancelled;
/***/ public String pushCertificateInvalidField;
@@ -699,7 +642,6 @@ public class JGitText extends TranslationBundle {
/***/ public String shortSkipOfBlock;
/***/ public String signingNotSupportedOnTag;
/***/ public String similarityScoreMustBeWithinBounds;
- /***/ public String sizeExceeds2GB;
/***/ public String skipMustBeNonNegative;
/***/ public String smartHTTPPushDisabled;
/***/ public String sourceDestinationMustMatch;
@@ -720,7 +662,6 @@ public class JGitText extends TranslationBundle {
/***/ public String staleRevFlagsOn;
/***/ public String startingReadStageWithoutWrittenRequestDataPendingIsNotSupported;
/***/ public String stashApplyConflict;
- /***/ public String stashApplyConflictInIndex;
/***/ public String stashApplyFailed;
/***/ public String stashApplyWithoutHead;
/***/ public String stashApplyOnUnsafeRepository;
@@ -761,7 +702,6 @@ public class JGitText extends TranslationBundle {
/***/ public String transportExceptionMissingAssumed;
/***/ public String transportExceptionReadRef;
/***/ public String transportNeedsRepository;
- /***/ public String transportProtoAmazonS3;
/***/ public String transportProtoBundleFile;
/***/ public String transportProtoFTP;
/***/ public String transportProtoGitAnon;
@@ -774,7 +714,6 @@ public class JGitText extends TranslationBundle {
/***/ public String transportSSHRetryInterrupt;
/***/ public String treeEntryAlreadyExists;
/***/ public String treeFilterMarkerTooManyFilters;
- /***/ public String treeIteratorDoesNotSupportRemove;
/***/ public String treeWalkMustHaveExactlyTwoTrees;
/***/ public String truncatedHunkLinesMissingForAncestor;
/***/ public String truncatedHunkNewLinesMissing;
@@ -784,10 +723,8 @@ public class JGitText extends TranslationBundle {
/***/ public String unableToCreateNewObject;
/***/ public String unableToReadPackfile;
/***/ public String unableToRemovePath;
- /***/ public String unableToStore;
/***/ public String unableToWrite;
/***/ public String unauthorized;
- /***/ public String underflowedReftableBlock;
/***/ public String unencodeableFile;
/***/ public String unexpectedCompareResult;
/***/ public String unexpectedEndOfConfigFile;
@@ -803,7 +740,6 @@ public class JGitText extends TranslationBundle {
/***/ public String unknownOrUnsupportedCommand;
/***/ public String unknownDIRCVersion;
/***/ public String unknownHost;
- /***/ public String unknownIndexVersionOrCorruptIndex;
/***/ public String unknownObject;
/***/ public String unknownObjectInIndex;
/***/ public String unknownObjectType;