From d7cc6eb0020d5efda7b6954217c464e3a6ce58da Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 6 May 2013 22:59:57 +0200 Subject: Move org.eclipse.jgit.pgm's resource bundle to internal package Translatable texts aren't API and shouldn't require maintenance of @since tags to prevent API warnings. Change-Id: I228ff37f17c0e792a6bc188c463a0d19138e88ac Signed-off-by: Matthias Sohn --- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 1 + .../src/org/eclipse/jgit/pgm/CLIGitCommand.java | 1 + org.eclipse.jgit.pgm/.settings/.api_filters | 15 -- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 1 + .../org/eclipse/jgit/pgm/CLIText.properties | 290 --------------------- .../eclipse/jgit/pgm/internal/CLIText.properties | 290 +++++++++++++++++++++ .../org/eclipse/jgit/pgm/AbstractFetchCommand.java | 1 + .../src/org/eclipse/jgit/pgm/AmazonS3Client.java | 1 + .../src/org/eclipse/jgit/pgm/Archive.java | 2 +- .../src/org/eclipse/jgit/pgm/Blame.java | 1 + .../src/org/eclipse/jgit/pgm/Branch.java | 1 + .../src/org/eclipse/jgit/pgm/CLIText.java | 242 ----------------- .../src/org/eclipse/jgit/pgm/Checkout.java | 1 + .../src/org/eclipse/jgit/pgm/Clone.java | 1 + .../src/org/eclipse/jgit/pgm/CommandRef.java | 2 + .../src/org/eclipse/jgit/pgm/Commit.java | 1 + .../src/org/eclipse/jgit/pgm/Daemon.java | 1 + .../src/org/eclipse/jgit/pgm/Diff.java | 1 + .../src/org/eclipse/jgit/pgm/Glog.java | 1 + .../src/org/eclipse/jgit/pgm/Init.java | 1 + .../src/org/eclipse/jgit/pgm/Log.java | 1 + .../src/org/eclipse/jgit/pgm/Main.java | 1 + .../src/org/eclipse/jgit/pgm/Merge.java | 1 + .../src/org/eclipse/jgit/pgm/Push.java | 1 + .../src/org/eclipse/jgit/pgm/ReceivePack.java | 1 + .../org/eclipse/jgit/pgm/RevWalkTextBuiltin.java | 1 + .../src/org/eclipse/jgit/pgm/Show.java | 1 + .../src/org/eclipse/jgit/pgm/Status.java | 1 + .../src/org/eclipse/jgit/pgm/Tag.java | 1 + .../src/org/eclipse/jgit/pgm/TextBuiltin.java | 1 + .../src/org/eclipse/jgit/pgm/UploadPack.java | 1 + .../src/org/eclipse/jgit/pgm/Version.java | 2 + .../eclipse/jgit/pgm/archive/ArchiveCommand.java | 2 +- .../org/eclipse/jgit/pgm/debug/DiffAlgorithms.java | 2 +- .../org/eclipse/jgit/pgm/debug/MakeCacheTree.java | 2 +- .../org/eclipse/jgit/pgm/debug/ReadDirCache.java | 2 +- .../eclipse/jgit/pgm/debug/RebuildCommitGraph.java | 2 +- .../org/eclipse/jgit/pgm/debug/ShowCacheTree.java | 2 +- .../org/eclipse/jgit/pgm/debug/ShowCommands.java | 2 +- .../eclipse/jgit/pgm/debug/TextHashFunctions.java | 2 +- .../org/eclipse/jgit/pgm/debug/WriteDirCache.java | 2 +- .../src/org/eclipse/jgit/pgm/internal/CLIText.java | 242 +++++++++++++++++ .../jgit/pgm/opt/AbstractTreeIteratorHandler.java | 2 +- .../org/eclipse/jgit/pgm/opt/CmdLineParser.java | 2 +- .../org/eclipse/jgit/pgm/opt/ObjectIdHandler.java | 2 +- .../jgit/pgm/opt/PathTreeFilterHandler.java | 2 +- .../org/eclipse/jgit/pgm/opt/RefSpecHandler.java | 2 +- .../org/eclipse/jgit/pgm/opt/RevCommitHandler.java | 2 +- .../org/eclipse/jgit/pgm/opt/RevTreeHandler.java | 2 +- .../eclipse/jgit/pgm/opt/SubcommandHandler.java | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 1 + .../tst/org/eclipse/jgit/nls/RootLocaleTest.java | 2 +- 52 files changed, 581 insertions(+), 566 deletions(-) delete mode 100644 org.eclipse.jgit.pgm/.settings/.api_filters delete mode 100644 org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties create mode 100644 org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties delete mode 100644 org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java create mode 100644 org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index e84ff0f0b4..4d82159305 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -14,6 +14,7 @@ Import-Package: org.eclipse.jgit.api;version="[3.0.0,3.1.0)", org.eclipse.jgit.lib;version="[3.0.0,3.1.0)", org.eclipse.jgit.merge;version="[3.0.0,3.1.0)", org.eclipse.jgit.pgm;version="[3.0.0,3.1.0)", + org.eclipse.jgit.pgm.internal;version="[3.0.0,3.1.0)", org.eclipse.jgit.pgm.opt;version="[3.0.0,3.1.0)", org.eclipse.jgit.revwalk;version="[3.0.0,3.1.0)", org.eclipse.jgit.storage.file;version="[3.0.0,3.1.0)", diff --git a/org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/pgm/CLIGitCommand.java b/org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/pgm/CLIGitCommand.java index 78706da314..d77b1505ae 100644 --- a/org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/pgm/CLIGitCommand.java +++ b/org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/pgm/CLIGitCommand.java @@ -48,6 +48,7 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.pgm.opt.CmdLineParser; import org.eclipse.jgit.pgm.opt.SubcommandHandler; import org.eclipse.jgit.util.IO; diff --git a/org.eclipse.jgit.pgm/.settings/.api_filters b/org.eclipse.jgit.pgm/.settings/.api_filters deleted file mode 100644 index 35db29c922..0000000000 --- a/org.eclipse.jgit.pgm/.settings/.api_filters +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 48c1f4269c..a6e5e21915 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -46,6 +46,7 @@ Export-Package: org.eclipse.jgit.pgm;version="3.0.0"; org.eclipse.jgit.awtui, org.eclipse.jgit.transport", org.eclipse.jgit.pgm.debug;version="3.0.0", + org.eclipse.jgit.pgm.internal;version="3.0.0";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", org.eclipse.jgit.pgm.opt;version="3.0.0" Main-Class: org.eclipse.jgit.pgm.Main Implementation-Title: JGit Command Line Interface diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties deleted file mode 100644 index cdf7123959..0000000000 --- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties +++ /dev/null @@ -1,290 +0,0 @@ -# default meta variable defined in the org.kohsuke.args4j.spi.StringOptionHandler -VAL=VAL -# default meta variable defined in the org.kohsuke.args4j.spi.StopOptionHandler -ARGUMENTS=ARGUMENTS -# default meta variable defined in the org.kohsuke.args4j.spi.OneArgumentOptionHandler -N=N - -alreadyOnBranch=Already on ''{0}'' -alreadyUpToDate=Already up-to-date. -authorInfo=Author: {0} <{1}> -averageMSPerRead=average {0} ms/read -branchAlreadyExists=A branch named ''{0}'' already exists. -branchCreatedFrom=branch: Created from {0} -branchDetachedHEAD=detached HEAD -branchIsNotAnAncestorOfYourCurrentHEAD=The branch ''{0}'' is not an ancestor of your current HEAD.\nIf you are sure you want to delete it, run ''jgit branch -D {0}''. -branchNotFound=branch ''{0}'' not found. -cacheTreePathInfo="{0}": {1} entries, {2} children -cannotBeRenamed={0} cannot be renamed -cannotChekoutNoHeadsAdvertisedByRemote=cannot checkout; no HEAD advertised by remote -cannotCombineSquashWithNoff=You cannot combine --squash with --no-ff. -cannotCreateCommand=Cannot create command {0} -cannotCreateOutputStream=cannot create output stream -cannotDeatchHEAD=Cannot detach HEAD -cannotDeleteFile=error: The following file could not be deleted: -cannotDeleteTheBranchWhichYouAreCurrentlyOn=Cannot delete the branch ''{0}'' which you are currently on. -cannotGuessLocalNameFrom=cannot guess local name from {0} -cannotLock=Cannot lock {0} -cannotMergeDetachedHead=Cannot merge into detached HEAD -cannotReadBecause=cannot read {0}: {1} -cannotReadPackageInformation=Cannot read package information. -cannotRenameDetachedHEAD=Cannot rename detached HEAD -cannotResolve=Cannot resolve {0} -cannotSetupConsole=Cannot setup console -cannotUseObjectsWithGlog=Cannot use --objects with glog -cantFindGitDirectory=error: can't find git directory -cantWrite=Can't write {0} -changesNotStagedForCommit=Changes not staged for commit: -changesToBeCommitted=Changes to be committed: -commitLabel=commit -configFileNotFound=configuration file {0} not found -conflictingUsageOf_git_dir_andArguments=conflicting usage of --git-dir and arguments -couldNotCreateBranch=Could not create branch {0}: {1} -dateInfo=Date: {0} -deletedBranch=Deleted branch {0} -deletedRemoteBranch=Deleted remote branch {0} -doesNotExist={0} does not exist -dontOverwriteLocalChanges=error: Your local changes to the following file would be overwritten by merge: -everythingUpToDate=Everything up-to-date -exceptionCaughtDuringExecutionOfArchiveCommand=Exception caught during execution of archive command -expectedNumberOfbytes=Expected {0} bytes. -exporting=Exporting {0} -failedToCommitIndex=failed to commit index -failedToLockIndex=failed to lock index -failedToLockTag=Failed to lock tag {0}: {1} -fatalError=fatal: {0} -fatalThisProgramWillDestroyTheRepository=fatal: This program will destroy the repository\nfatal:\nfatal:\nfatal: {0}\nfatal:\nfatal: To continue, add {1} to the command line\nfatal: -fileIsRequired=argument file is required -ffNotPossibleAborting=Not possible to fast-forward, aborting. -forcedUpdate=forced update -fromURI=From {0} -initializedEmptyGitRepositoryIn=Initialized empty Git repository in {0} -invalidHttpProxyOnlyHttpSupported=Invalid http_proxy: {0}: Only http supported. -jgitVersion=jgit version {0} -lineFormat=# {0} -listeningOn=Listening on {0} -mergeConflict=CONFLICT(content): Merge conflict in {0} -mergeCheckoutConflict=error: Your local changes to the following files would be overwritten by merge: -mergeFailed=Automatic merge failed; fix conflicts and then commit the result -mergeCheckoutFailed=Please, commit your changes or stash them before you can merge. -mergeMadeBy=Merge made by the ''{0}'' strategy. -mergedSquashed=Squash commit -- not updating HEAD -mergeWentWellStoppedBeforeCommitting=Automatic merge went well; stopped before committing as requested -metaVar_DAG=DAG -metaVar_KEY=KEY -metaVar_archiveFormat=format -metaVar_arg=ARG -metaVar_author=AUTHOR -metaVar_base=base -metaVar_blameL=START,END -metaVar_blameReverse=START..END -metaVar_branchName=branch -metaVar_bucket=BUCKET -metaVar_command=command -metaVar_commandDetail=DETAIL -metaVar_commitish=commit-ish -metaVar_commitOrTag=COMMIT|TAG -metaVar_commitPaths=paths -metaVar_configFile=FILE -metaVar_connProp=conn.prop -metaVar_diffAlg=ALGORITHM -metaVar_directory=DIRECTORY -metaVar_file=FILE -metaVar_filepattern=filepattern -metaVar_gitDir=GIT_DIR -metaVar_hostName=HOSTNAME -metaVar_linesOfContext=lines -metaVar_message=message -metaVar_n=n -metaVar_name=name -metaVar_object=object -metaVar_op=OP -metaVar_pass=PASS -metaVar_path=path -metaVar_paths=path ... -metaVar_port=PORT -metaVar_ref=REF -metaVar_refs=REFS -metaVar_refspec=refspec -metaVar_remoteName=name -metaVar_revision=REVISION -metaVar_seconds=SECONDS -metaVar_service=SERVICE -metaVar_treeish=tree-ish -metaVar_uriish=uri-ish -metaVar_url=URL -metaVar_user=USER -metaVar_version=VERSION -mostCommonlyUsedCommandsAre=The most commonly used commands are: -needApprovalToDestroyCurrentRepository=Need approval to destroy current repository -noGitRepositoryConfigured=No Git repository configured. -noSuchFile=no such file: {0} -noSuchRemoteRef=no such remote ref: ''{0}'' -noTREESectionInIndex=no 'TREE' section in index -nonFastForward=non-fast forward -notABranch={0} is not a branch -notACommit={0} is not a commit -notAGitRepository=''{0}'' not a git repository -notAJgitCommand={0} is not a jgit command -notARevision=Not a revision: {0} -notATree={0} is not a tree -notAValidRefName={0} is not a valid ref name -notAnIndexFile={0} is not an index file -notAnObject={0} is not an object -notFound=!! NOT FOUND !! -noteObjectTooLargeToPrint=Note object {0} too large to print -nothingToSquash=\ (nothing to squash) -notOnAnyBranch=Not currently on any branch. -onBranch=On branch {0} -onBranchToBeBorn=You are on a branch yet to be born -onlyOneMetaVarExpectedIn=Only one {0} expected in {1}. -onlyOneOfIncludeOnlyAllInteractiveCanBeUsed=Only one of --include/--only/--all/--interactive can be used. -pathspecDidNotMatch=error: pathspec ''{0}'' did not match any file(s) known to git. -pushTo=To {0} -pathsRequired=at least one path has to be specified when using --only -refDoesNotExistOrNoCommit={0} does not exist or is not referring to a commit -remoteMessage=remote: {0} -remoteRefObjectChangedIsNotExpectedOne=remote ref object changed - is not expected one {0} -remoteSideDoesNotSupportDeletingRefs=remote side does not support deleting refs -repaint=Repaint -serviceNotSupported=Service ''{0}'' not supported -skippingObject=skipping {0} {1} -statusFileListFormat=\t%1$s -statusFileListFormatWithPrefix=\t%1$-11s %2$s -statusFileListFormatUnmerged=\t%1$-20s%2$s -statusModified=modified: -statusNewFile=new file: -statusRemoved=deleted: -statusBothDeleted=both deleted: -statusAddedByUs=added by us: -statusDeletedByThem=deleted by them: -statusAddedByThem=added by them: -statusDeletedByUs=deleted by us: -statusBothAdded=both added: -statusBothModified=both modified: -switchedToNewBranch=Switched to a new branch ''{0}'' -switchedToBranch=Switched to branch ''{0}'' -tagAlreadyExists=tag ''{0}'' already exists -tagLabel=tag -taggerInfo=Tagger: {0} <{1}> -timeInMilliSeconds={0} ms -treeIsRequired=argument tree is required -tooManyRefsGiven=Too many refs given -unknownIoErrorStdout=An unknown I/O error occurred on standard output -unknownMergeStrategy=unknown merge strategy {0} specified -unmergedPaths=Unmerged paths: -unsupportedOperation=Unsupported operation: {0} -untrackedFiles=Untracked files: -updating=Updating {0}..{1} -usage_Blame=Show what revision and author last modified each line -usage_CommandLineClientForamazonsS3Service=Command line client for Amazon's S3 service -usage_CommitAll=commit all modified and deleted files -usage_CommitAuthor=Override the author name used in the commit. You can use the standard A U Thor format. -usage_CommitMessage=Use the given as the commit message -usage_CommitOnly=commit specified paths only -usage_CommitAmend=Amend the tip of the current branch -usage_CommitPaths=see --only -usage_CreateABareRepository=Create a bare repository -usage_CreateATag=Create a tag -usage_CreateAnEmptyGitRepository=Create an empty git repository -usage_DisplayTheVersionOfJgit=Display the version of jgit -usage_MergesTwoDevelopmentHistories=Merges two development histories -usage_RepositoryToReadFrom=Repository to read from -usage_RepositoryToReceiveInto=Repository to receive into -usage_ServerSideBackendForJgitFetch=Server side backend for 'jgit fetch' -usage_ServerSideBackendForJgitPush=Server side backend for 'jgit push' -usage_ShowDiffs=Show diffs -usage_Status=Show the working tree status -usage_StopTrackingAFile=Stop tracking a file -usage_UpdateRemoteRepositoryFromLocalRefs=Update remote repository from local refs -usage_abbrevCommits=abbreviate commits to N + 1 digits -usage_abortConnectionIfNoActivity=abort connection if no activity -usage_actOnRemoteTrackingBranches=act on remote-tracking branches -usage_addFileContentsToTheIndex=Add file contents to the index -usage_alterTheDetailShown=alter the detail shown -usage_approveDestructionOfRepository=approve destruction of repository -usage_archive=zip up files from the named tree -usage_archiveFormat=archive format. Currently supported formats: 'tar', 'zip' -usage_blameLongRevision=show long revision -usage_blameRange=annotate only the given range -usage_blameRawTimestamp=show raw timestamp -usage_blameReverse=show origin of deletions instead of insertions -usage_blameShowBlankBoundary=show blank SHA-1 for boundary commits -usage_blameShowEmail=show author email instead of name -usage_blameShowRoot=do not treat root commits as boundaries -usage_blameShowSourceLine=show source line number -usage_blameShowSourcePath=show source filename -usage_blameSuppressAuthor=do not show author name and timestamp -usage_beMoreVerbose=be more verbose -usage_beVerbose=be verbose -usage_cached=compare against index -usage_checkout=Checkout a branch to the working tree -usage_cloneRepositoryIntoNewDir=Clone a repository into a new directory -usage_configFile=configuration file -usage_configureTheServiceInDaemonServicename=configure the service in daemon.servicename -usage_createBranchAndCheckout=create branch and checkout -usage_deleteBranchEvenIfNotMerged=delete branch (even if not merged) -usage_deleteFullyMergedBranch=delete fully merged branch -usage_date=date format, one of default, rfc, local, iso, short, raw (as defined by git-log(1) ), locale or localelocal (jgit extensions) -usage_detectRenames=detect renamed files -usage_diffAlgorithm=the diff algorithm to use. Currently supported are: 'myers', 'histogram' -usage_directoriesToExport=directories to export -usage_disableTheServiceInAllRepositories=disable the service in all repositories -usage_displayAListOfAllRegisteredJgitCommands=Display a list of all registered jgit commands -usage_displayAllPossibleMergeBases=display all possible merge bases -usage_displayThejavaStackTraceOnExceptions=display the Java stack trace on exceptions -usage_displayThisHelpText=display this help text -usage_dstPrefix=show the destination prefix instead of "b/" -usage_enableTheServiceInAllRepositories=enable the service in all repositories -usage_exportRepositoriesOverGit=Export repositories over git:// -usage_exportWithoutGitDaemonExportOk=export without git-daemon-export-ok -usage_fetchThinPack=fetch thin pack -usage_filesToAddContentFrom=Files to add content from -usage_fixAThinPackToBeComplete=fix a thin pack to be complete -usage_forEachRefOutput=for-each-ref output -usage_forceCheckout=when switching branches, proceed even if the index or the working tree differs from HEAD -usage_forceCreateBranchEvenExists=force create branch even exists -usage_forceReplacingAnExistingTag=force replacing an existing tag -usage_getAndSetOptions=Get and set repository or global options -usage_hostnameOrIpToListenOn=hostname (or ip) to listen on -usage_indexFileFormatToCreate=index file format to create -usage_ignoreWhitespace=ignore all whitespace -usage_inputOutputFile=Input/output file -usage_listBothRemoteTrackingAndLocalBranches=list both remote-tracking and local branches -usage_listCreateOrDeleteBranches=List, create, or delete branches -usage_logAllPretty=format:%H %ct %P' output=log --all '--pretty=format:%H %ct %P' output -usage_manageReflogInformation=Manage reflog information -usage_mergeStrategy=Use the given merge strategy. Can be supplied more than once to specify them in the order they should be tried. If there is no -s option, the resolve strategy is used. Currently the following strategies are supported: ours, theirs, simple-two-way-in-core, resolve -usage_moveRenameABranch=move/rename a branch -usage_nameStatus=show only name and status of files -usage_noCommit=Don't commit after a successful merge -usage_noPrefix=do not show any source or destination prefix -usage_noRenames=disable rename detection -usage_noShowStandardNotes=Disable showing notes from the standard /refs/notes/commits branch -usage_onlyMatchAgainstAlreadyTrackedFiles=Only match against already tracked files in the index rather than the working tree -usage_outputFile=Output file -usage_path=path -usage_performFsckStyleChecksOnReceive=perform fsck style checks on receive -usage_portNumberToListenOn=port number to listen on -usage_pruneStaleTrackingRefs=prune stale tracking refs -usage_recordChangesToRepository=Record changes to the repository -usage_recurseIntoSubtrees=recurse into subtrees -usage_renameLimit=limit size of rename matrix -usage_reset=Reset current HEAD to the specified state -usage_resetHard=Resets the index and working tree -usage_resetSoft=Resets without touching the index file nor the working tree -usage_resetMixed=Resets the index but not the working tree -usage_setTheGitRepositoryToOperateOn=set the git repository to operate on -usage_show=display one commit -usage_showRefNamesMatchingCommits=Show ref names matching commits -usage_showPatch=display patch -usage_showRefNamesMatchingCommits=Show ref names matching commits -usage_showNotes=Add this ref to the list of note branches from which notes are displayed -usage_squash=Squash commits as if a real merge happened, but do not make a commit or move the HEAD. -usage_srcPrefix=show the source prefix instead of "a/" -usage_symbolicVersionForTheProject=Symbolic version for the project -usage_tagMessage=tag message -usage_updateRemoteRefsFromAnotherRepository=Update remote refs from another repository -usage_useNameInsteadOfOriginToTrackUpstream=use instead of 'origin' to track upstream -usage_checkoutBranchAfterClone=checkout named branch instead of remotes's HEAD -usage_viewCommitHistory=View commit history diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties new file mode 100644 index 0000000000..cdf7123959 --- /dev/null +++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties @@ -0,0 +1,290 @@ +# default meta variable defined in the org.kohsuke.args4j.spi.StringOptionHandler +VAL=VAL +# default meta variable defined in the org.kohsuke.args4j.spi.StopOptionHandler +ARGUMENTS=ARGUMENTS +# default meta variable defined in the org.kohsuke.args4j.spi.OneArgumentOptionHandler +N=N + +alreadyOnBranch=Already on ''{0}'' +alreadyUpToDate=Already up-to-date. +authorInfo=Author: {0} <{1}> +averageMSPerRead=average {0} ms/read +branchAlreadyExists=A branch named ''{0}'' already exists. +branchCreatedFrom=branch: Created from {0} +branchDetachedHEAD=detached HEAD +branchIsNotAnAncestorOfYourCurrentHEAD=The branch ''{0}'' is not an ancestor of your current HEAD.\nIf you are sure you want to delete it, run ''jgit branch -D {0}''. +branchNotFound=branch ''{0}'' not found. +cacheTreePathInfo="{0}": {1} entries, {2} children +cannotBeRenamed={0} cannot be renamed +cannotChekoutNoHeadsAdvertisedByRemote=cannot checkout; no HEAD advertised by remote +cannotCombineSquashWithNoff=You cannot combine --squash with --no-ff. +cannotCreateCommand=Cannot create command {0} +cannotCreateOutputStream=cannot create output stream +cannotDeatchHEAD=Cannot detach HEAD +cannotDeleteFile=error: The following file could not be deleted: +cannotDeleteTheBranchWhichYouAreCurrentlyOn=Cannot delete the branch ''{0}'' which you are currently on. +cannotGuessLocalNameFrom=cannot guess local name from {0} +cannotLock=Cannot lock {0} +cannotMergeDetachedHead=Cannot merge into detached HEAD +cannotReadBecause=cannot read {0}: {1} +cannotReadPackageInformation=Cannot read package information. +cannotRenameDetachedHEAD=Cannot rename detached HEAD +cannotResolve=Cannot resolve {0} +cannotSetupConsole=Cannot setup console +cannotUseObjectsWithGlog=Cannot use --objects with glog +cantFindGitDirectory=error: can't find git directory +cantWrite=Can't write {0} +changesNotStagedForCommit=Changes not staged for commit: +changesToBeCommitted=Changes to be committed: +commitLabel=commit +configFileNotFound=configuration file {0} not found +conflictingUsageOf_git_dir_andArguments=conflicting usage of --git-dir and arguments +couldNotCreateBranch=Could not create branch {0}: {1} +dateInfo=Date: {0} +deletedBranch=Deleted branch {0} +deletedRemoteBranch=Deleted remote branch {0} +doesNotExist={0} does not exist +dontOverwriteLocalChanges=error: Your local changes to the following file would be overwritten by merge: +everythingUpToDate=Everything up-to-date +exceptionCaughtDuringExecutionOfArchiveCommand=Exception caught during execution of archive command +expectedNumberOfbytes=Expected {0} bytes. +exporting=Exporting {0} +failedToCommitIndex=failed to commit index +failedToLockIndex=failed to lock index +failedToLockTag=Failed to lock tag {0}: {1} +fatalError=fatal: {0} +fatalThisProgramWillDestroyTheRepository=fatal: This program will destroy the repository\nfatal:\nfatal:\nfatal: {0}\nfatal:\nfatal: To continue, add {1} to the command line\nfatal: +fileIsRequired=argument file is required +ffNotPossibleAborting=Not possible to fast-forward, aborting. +forcedUpdate=forced update +fromURI=From {0} +initializedEmptyGitRepositoryIn=Initialized empty Git repository in {0} +invalidHttpProxyOnlyHttpSupported=Invalid http_proxy: {0}: Only http supported. +jgitVersion=jgit version {0} +lineFormat=# {0} +listeningOn=Listening on {0} +mergeConflict=CONFLICT(content): Merge conflict in {0} +mergeCheckoutConflict=error: Your local changes to the following files would be overwritten by merge: +mergeFailed=Automatic merge failed; fix conflicts and then commit the result +mergeCheckoutFailed=Please, commit your changes or stash them before you can merge. +mergeMadeBy=Merge made by the ''{0}'' strategy. +mergedSquashed=Squash commit -- not updating HEAD +mergeWentWellStoppedBeforeCommitting=Automatic merge went well; stopped before committing as requested +metaVar_DAG=DAG +metaVar_KEY=KEY +metaVar_archiveFormat=format +metaVar_arg=ARG +metaVar_author=AUTHOR +metaVar_base=base +metaVar_blameL=START,END +metaVar_blameReverse=START..END +metaVar_branchName=branch +metaVar_bucket=BUCKET +metaVar_command=command +metaVar_commandDetail=DETAIL +metaVar_commitish=commit-ish +metaVar_commitOrTag=COMMIT|TAG +metaVar_commitPaths=paths +metaVar_configFile=FILE +metaVar_connProp=conn.prop +metaVar_diffAlg=ALGORITHM +metaVar_directory=DIRECTORY +metaVar_file=FILE +metaVar_filepattern=filepattern +metaVar_gitDir=GIT_DIR +metaVar_hostName=HOSTNAME +metaVar_linesOfContext=lines +metaVar_message=message +metaVar_n=n +metaVar_name=name +metaVar_object=object +metaVar_op=OP +metaVar_pass=PASS +metaVar_path=path +metaVar_paths=path ... +metaVar_port=PORT +metaVar_ref=REF +metaVar_refs=REFS +metaVar_refspec=refspec +metaVar_remoteName=name +metaVar_revision=REVISION +metaVar_seconds=SECONDS +metaVar_service=SERVICE +metaVar_treeish=tree-ish +metaVar_uriish=uri-ish +metaVar_url=URL +metaVar_user=USER +metaVar_version=VERSION +mostCommonlyUsedCommandsAre=The most commonly used commands are: +needApprovalToDestroyCurrentRepository=Need approval to destroy current repository +noGitRepositoryConfigured=No Git repository configured. +noSuchFile=no such file: {0} +noSuchRemoteRef=no such remote ref: ''{0}'' +noTREESectionInIndex=no 'TREE' section in index +nonFastForward=non-fast forward +notABranch={0} is not a branch +notACommit={0} is not a commit +notAGitRepository=''{0}'' not a git repository +notAJgitCommand={0} is not a jgit command +notARevision=Not a revision: {0} +notATree={0} is not a tree +notAValidRefName={0} is not a valid ref name +notAnIndexFile={0} is not an index file +notAnObject={0} is not an object +notFound=!! NOT FOUND !! +noteObjectTooLargeToPrint=Note object {0} too large to print +nothingToSquash=\ (nothing to squash) +notOnAnyBranch=Not currently on any branch. +onBranch=On branch {0} +onBranchToBeBorn=You are on a branch yet to be born +onlyOneMetaVarExpectedIn=Only one {0} expected in {1}. +onlyOneOfIncludeOnlyAllInteractiveCanBeUsed=Only one of --include/--only/--all/--interactive can be used. +pathspecDidNotMatch=error: pathspec ''{0}'' did not match any file(s) known to git. +pushTo=To {0} +pathsRequired=at least one path has to be specified when using --only +refDoesNotExistOrNoCommit={0} does not exist or is not referring to a commit +remoteMessage=remote: {0} +remoteRefObjectChangedIsNotExpectedOne=remote ref object changed - is not expected one {0} +remoteSideDoesNotSupportDeletingRefs=remote side does not support deleting refs +repaint=Repaint +serviceNotSupported=Service ''{0}'' not supported +skippingObject=skipping {0} {1} +statusFileListFormat=\t%1$s +statusFileListFormatWithPrefix=\t%1$-11s %2$s +statusFileListFormatUnmerged=\t%1$-20s%2$s +statusModified=modified: +statusNewFile=new file: +statusRemoved=deleted: +statusBothDeleted=both deleted: +statusAddedByUs=added by us: +statusDeletedByThem=deleted by them: +statusAddedByThem=added by them: +statusDeletedByUs=deleted by us: +statusBothAdded=both added: +statusBothModified=both modified: +switchedToNewBranch=Switched to a new branch ''{0}'' +switchedToBranch=Switched to branch ''{0}'' +tagAlreadyExists=tag ''{0}'' already exists +tagLabel=tag +taggerInfo=Tagger: {0} <{1}> +timeInMilliSeconds={0} ms +treeIsRequired=argument tree is required +tooManyRefsGiven=Too many refs given +unknownIoErrorStdout=An unknown I/O error occurred on standard output +unknownMergeStrategy=unknown merge strategy {0} specified +unmergedPaths=Unmerged paths: +unsupportedOperation=Unsupported operation: {0} +untrackedFiles=Untracked files: +updating=Updating {0}..{1} +usage_Blame=Show what revision and author last modified each line +usage_CommandLineClientForamazonsS3Service=Command line client for Amazon's S3 service +usage_CommitAll=commit all modified and deleted files +usage_CommitAuthor=Override the author name used in the commit. You can use the standard A U Thor format. +usage_CommitMessage=Use the given as the commit message +usage_CommitOnly=commit specified paths only +usage_CommitAmend=Amend the tip of the current branch +usage_CommitPaths=see --only +usage_CreateABareRepository=Create a bare repository +usage_CreateATag=Create a tag +usage_CreateAnEmptyGitRepository=Create an empty git repository +usage_DisplayTheVersionOfJgit=Display the version of jgit +usage_MergesTwoDevelopmentHistories=Merges two development histories +usage_RepositoryToReadFrom=Repository to read from +usage_RepositoryToReceiveInto=Repository to receive into +usage_ServerSideBackendForJgitFetch=Server side backend for 'jgit fetch' +usage_ServerSideBackendForJgitPush=Server side backend for 'jgit push' +usage_ShowDiffs=Show diffs +usage_Status=Show the working tree status +usage_StopTrackingAFile=Stop tracking a file +usage_UpdateRemoteRepositoryFromLocalRefs=Update remote repository from local refs +usage_abbrevCommits=abbreviate commits to N + 1 digits +usage_abortConnectionIfNoActivity=abort connection if no activity +usage_actOnRemoteTrackingBranches=act on remote-tracking branches +usage_addFileContentsToTheIndex=Add file contents to the index +usage_alterTheDetailShown=alter the detail shown +usage_approveDestructionOfRepository=approve destruction of repository +usage_archive=zip up files from the named tree +usage_archiveFormat=archive format. Currently supported formats: 'tar', 'zip' +usage_blameLongRevision=show long revision +usage_blameRange=annotate only the given range +usage_blameRawTimestamp=show raw timestamp +usage_blameReverse=show origin of deletions instead of insertions +usage_blameShowBlankBoundary=show blank SHA-1 for boundary commits +usage_blameShowEmail=show author email instead of name +usage_blameShowRoot=do not treat root commits as boundaries +usage_blameShowSourceLine=show source line number +usage_blameShowSourcePath=show source filename +usage_blameSuppressAuthor=do not show author name and timestamp +usage_beMoreVerbose=be more verbose +usage_beVerbose=be verbose +usage_cached=compare against index +usage_checkout=Checkout a branch to the working tree +usage_cloneRepositoryIntoNewDir=Clone a repository into a new directory +usage_configFile=configuration file +usage_configureTheServiceInDaemonServicename=configure the service in daemon.servicename +usage_createBranchAndCheckout=create branch and checkout +usage_deleteBranchEvenIfNotMerged=delete branch (even if not merged) +usage_deleteFullyMergedBranch=delete fully merged branch +usage_date=date format, one of default, rfc, local, iso, short, raw (as defined by git-log(1) ), locale or localelocal (jgit extensions) +usage_detectRenames=detect renamed files +usage_diffAlgorithm=the diff algorithm to use. Currently supported are: 'myers', 'histogram' +usage_directoriesToExport=directories to export +usage_disableTheServiceInAllRepositories=disable the service in all repositories +usage_displayAListOfAllRegisteredJgitCommands=Display a list of all registered jgit commands +usage_displayAllPossibleMergeBases=display all possible merge bases +usage_displayThejavaStackTraceOnExceptions=display the Java stack trace on exceptions +usage_displayThisHelpText=display this help text +usage_dstPrefix=show the destination prefix instead of "b/" +usage_enableTheServiceInAllRepositories=enable the service in all repositories +usage_exportRepositoriesOverGit=Export repositories over git:// +usage_exportWithoutGitDaemonExportOk=export without git-daemon-export-ok +usage_fetchThinPack=fetch thin pack +usage_filesToAddContentFrom=Files to add content from +usage_fixAThinPackToBeComplete=fix a thin pack to be complete +usage_forEachRefOutput=for-each-ref output +usage_forceCheckout=when switching branches, proceed even if the index or the working tree differs from HEAD +usage_forceCreateBranchEvenExists=force create branch even exists +usage_forceReplacingAnExistingTag=force replacing an existing tag +usage_getAndSetOptions=Get and set repository or global options +usage_hostnameOrIpToListenOn=hostname (or ip) to listen on +usage_indexFileFormatToCreate=index file format to create +usage_ignoreWhitespace=ignore all whitespace +usage_inputOutputFile=Input/output file +usage_listBothRemoteTrackingAndLocalBranches=list both remote-tracking and local branches +usage_listCreateOrDeleteBranches=List, create, or delete branches +usage_logAllPretty=format:%H %ct %P' output=log --all '--pretty=format:%H %ct %P' output +usage_manageReflogInformation=Manage reflog information +usage_mergeStrategy=Use the given merge strategy. Can be supplied more than once to specify them in the order they should be tried. If there is no -s option, the resolve strategy is used. Currently the following strategies are supported: ours, theirs, simple-two-way-in-core, resolve +usage_moveRenameABranch=move/rename a branch +usage_nameStatus=show only name and status of files +usage_noCommit=Don't commit after a successful merge +usage_noPrefix=do not show any source or destination prefix +usage_noRenames=disable rename detection +usage_noShowStandardNotes=Disable showing notes from the standard /refs/notes/commits branch +usage_onlyMatchAgainstAlreadyTrackedFiles=Only match against already tracked files in the index rather than the working tree +usage_outputFile=Output file +usage_path=path +usage_performFsckStyleChecksOnReceive=perform fsck style checks on receive +usage_portNumberToListenOn=port number to listen on +usage_pruneStaleTrackingRefs=prune stale tracking refs +usage_recordChangesToRepository=Record changes to the repository +usage_recurseIntoSubtrees=recurse into subtrees +usage_renameLimit=limit size of rename matrix +usage_reset=Reset current HEAD to the specified state +usage_resetHard=Resets the index and working tree +usage_resetSoft=Resets without touching the index file nor the working tree +usage_resetMixed=Resets the index but not the working tree +usage_setTheGitRepositoryToOperateOn=set the git repository to operate on +usage_show=display one commit +usage_showRefNamesMatchingCommits=Show ref names matching commits +usage_showPatch=display patch +usage_showRefNamesMatchingCommits=Show ref names matching commits +usage_showNotes=Add this ref to the list of note branches from which notes are displayed +usage_squash=Squash commits as if a real merge happened, but do not make a commit or move the HEAD. +usage_srcPrefix=show the source prefix instead of "a/" +usage_symbolicVersionForTheProject=Symbolic version for the project +usage_tagMessage=tag message +usage_updateRemoteRefsFromAnotherRepository=Update remote refs from another repository +usage_useNameInsteadOfOriginToTrackUpstream=use instead of 'origin' to track upstream +usage_checkoutBranchAfterClone=checkout named branch instead of remotes's HEAD +usage_viewCommitHistory=View commit history diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java index ad9a36db18..1fe39da8a6 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java @@ -57,6 +57,7 @@ import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.RefUpdate; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.transport.FetchResult; import org.eclipse.jgit.transport.TrackingRefUpdate; import org.kohsuke.args4j.Option; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AmazonS3Client.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AmazonS3Client.java index 365d968aa5..5e66c36012 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AmazonS3Client.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AmazonS3Client.java @@ -57,6 +57,7 @@ import java.net.URLConnection; import java.text.MessageFormat; import java.util.Properties; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.transport.AmazonS3; import org.kohsuke.args4j.Argument; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java index 5685aa4267..815c96bfe1 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Archive.java @@ -44,9 +44,9 @@ package org.eclipse.jgit.pgm; import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.TextBuiltin; import org.eclipse.jgit.pgm.archive.ArchiveCommand; +import org.eclipse.jgit.pgm.internal.CLIText; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Blame.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Blame.java index 341a25b516..286710ec91 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Blame.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Blame.java @@ -68,6 +68,7 @@ import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevFlag; import org.kohsuke.args4j.Argument; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Branch.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Branch.java index 28e30bcbc2..969a8e0c08 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Branch.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Branch.java @@ -60,6 +60,7 @@ import org.eclipse.jgit.lib.RefRename; import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.RefUpdate.Result; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.pgm.opt.CmdLineParser; import org.eclipse.jgit.revwalk.RevWalk; import org.kohsuke.args4j.Argument; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java deleted file mode 100644 index faeed632ab..0000000000 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java +++ /dev/null @@ -1,242 +0,0 @@ -/* - * Copyright (C) 2010, 2013 Sasa Zivkov - * and other copyright owners as documented in the project's IP log. - * - * This program and the accompanying materials are made available - * under the terms of the Eclipse Distribution License v1.0 which - * accompanies this distribution, is reproduced below, and is - * available at http://www.eclipse.org/org/documents/edl-v10.php - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * - Neither the name of the Eclipse Foundation, Inc. nor the - * names of its contributors may be used to endorse or promote - * products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package org.eclipse.jgit.pgm; - -import java.text.MessageFormat; - -import org.eclipse.jgit.nls.NLS; -import org.eclipse.jgit.nls.TranslationBundle; - -/** - * Translation bundle for JGit command line interface - */ -public class CLIText extends TranslationBundle { - - /** - * @return an instance of this translation bundle - */ - public static CLIText get() { - return NLS.getBundleFor(CLIText.class); - } - - /** - * Format the given line for using the format defined by {@link #lineFormat} - * ("# " by default). - * - * @param line - * the line to format - * @return the formatted line - * @since 2.2 - */ - public static String formatLine(String line) { - return MessageFormat.format(get().lineFormat, line); - } - - // @formatter:off - /***/ public String alreadyOnBranch; - /***/ public String alreadyUpToDate; - /***/ public String authorInfo; - /***/ public String averageMSPerRead; - /***/ public String branchAlreadyExists; - /***/ public String branchCreatedFrom; - /***/ public String branchDetachedHEAD; - /***/ public String branchIsNotAnAncestorOfYourCurrentHEAD; - /***/ public String branchNotFound; - /***/ public String cacheTreePathInfo; - /***/ public String configFileNotFound; - /***/ public String cannotBeRenamed; - /***/ public String cannotChekoutNoHeadsAdvertisedByRemote; - /***/ public String cannotCombineSquashWithNoff; - /***/ public String cannotCreateCommand; - /***/ public String cannotCreateOutputStream; - /***/ public String cannotDeatchHEAD; - /***/ public String cannotDeleteFile; - /***/ public String cannotDeleteTheBranchWhichYouAreCurrentlyOn; - /***/ public String cannotGuessLocalNameFrom; - /***/ public String cannotLock; - /***/ public String cannotMergeDetachedHead; - /***/ public String cannotReadBecause; - /***/ public String cannotReadPackageInformation; - /***/ public String cannotRenameDetachedHEAD; - /***/ public String cannotResolve; - /***/ public String cannotSetupConsole; - /***/ public String cannotUseObjectsWithGlog; - /***/ public String cantFindGitDirectory; - /***/ public String cantWrite; - /***/ public String changesNotStagedForCommit; - /***/ public String changesToBeCommitted; - /***/ public String commitLabel; - /***/ public String conflictingUsageOf_git_dir_andArguments; - /***/ public String couldNotCreateBranch; - /***/ public String dateInfo; - /***/ public String deletedBranch; - /***/ public String deletedRemoteBranch; - /***/ public String doesNotExist; - /***/ public String dontOverwriteLocalChanges; - /***/ public String everythingUpToDate; - /***/ public String exceptionCaughtDuringExecutionOfArchiveCommand; - /***/ public String expectedNumberOfbytes; - /***/ public String exporting; - /***/ public String failedToCommitIndex; - /***/ public String failedToLockIndex; - /***/ public String failedToLockTag; - /***/ public String fatalError; - /***/ public String fatalThisProgramWillDestroyTheRepository; - /***/ public String fileIsRequired; - /***/ public String ffNotPossibleAborting; - /***/ public String forcedUpdate; - /***/ public String fromURI; - /***/ public String initializedEmptyGitRepositoryIn; - /***/ public String invalidHttpProxyOnlyHttpSupported; - /***/ public String jgitVersion; - /***/ public String lineFormat; - /***/ public String listeningOn; - /***/ public String mergeCheckoutConflict; - /***/ public String mergeConflict; - /***/ public String mergeFailed; - /***/ public String mergeCheckoutFailed; - /***/ public String mergeMadeBy; - /***/ public String mergedSquashed; - /***/ public String mergeWentWellStoppedBeforeCommitting; - /***/ public String metaVar_KEY; - /***/ public String metaVar_archiveFormat; - /***/ public String metaVar_arg; - /***/ public String metaVar_author; - /***/ public String metaVar_bucket; - /***/ public String metaVar_command; - /***/ public String metaVar_commandDetail; - /***/ public String metaVar_commitOrTag; - /***/ public String metaVar_commitPaths; - /***/ public String metaVar_commitish; - /***/ public String metaVar_configFile; - /***/ public String metaVar_connProp; - /***/ public String metaVar_diffAlg; - /***/ public String metaVar_directory; - /***/ public String metaVar_file; - /***/ public String metaVar_filepattern; - /***/ public String metaVar_gitDir; - /***/ public String metaVar_hostName; - /***/ public String metaVar_linesOfContext; - /***/ public String metaVar_message; - /***/ public String metaVar_n; - /***/ public String metaVar_name; - /***/ public String metaVar_object; - /***/ public String metaVar_op; - /***/ public String metaVar_pass; - /***/ public String metaVar_path; - /***/ public String metaVar_paths; - /***/ public String metaVar_port; - /***/ public String metaVar_ref; - /***/ public String metaVar_refs; - /***/ public String metaVar_refspec; - /***/ public String metaVar_remoteName; - /***/ public String metaVar_seconds; - /***/ public String metaVar_service; - /***/ public String metaVar_treeish; - /***/ public String metaVar_uriish; - /***/ public String metaVar_url; - /***/ public String metaVar_user; - /***/ public String metaVar_version; - /***/ public String mostCommonlyUsedCommandsAre; - /***/ public String needApprovalToDestroyCurrentRepository; - /***/ public String noGitRepositoryConfigured; - /***/ public String noSuchFile; - /***/ public String noSuchRemoteRef; - /***/ public String noTREESectionInIndex; - /***/ public String nonFastForward; - /***/ public String notABranch; - /***/ public String notACommit; - /***/ public String notAGitRepository; - /***/ public String notAJgitCommand; - /***/ public String notARevision; - /***/ public String notATree; - /***/ public String notAValidRefName; - /***/ public String notAnIndexFile; - /***/ public String notAnObject; - /***/ public String notFound; - /***/ public String notOnAnyBranch; - /***/ public String noteObjectTooLargeToPrint; - /***/ public String nothingToSquash; - /***/ public String onBranchToBeBorn; - /***/ public String onBranch; - /***/ public String onlyOneMetaVarExpectedIn; - /***/ public String onlyOneOfIncludeOnlyAllInteractiveCanBeUsed; - /***/ public String pathspecDidNotMatch; - /***/ public String pushTo; - /***/ public String pathsRequired; - /***/ public String refDoesNotExistOrNoCommit; - /***/ public String remoteMessage; - /***/ public String remoteRefObjectChangedIsNotExpectedOne; - /***/ public String remoteSideDoesNotSupportDeletingRefs; - /***/ public String repaint; - /***/ public String serviceNotSupported; - /***/ public String skippingObject; - /***/ public String statusFileListFormat; - /***/ public String statusFileListFormatWithPrefix; - /***/ public String statusFileListFormatUnmerged; - /***/ public String statusModified; - /***/ public String statusNewFile; - /***/ public String statusRemoved; - /***/ public String statusBothDeleted; - /***/ public String statusAddedByUs; - /***/ public String statusDeletedByThem; - /***/ public String statusAddedByThem; - /***/ public String statusDeletedByUs; - /***/ public String statusBothAdded; - /***/ public String statusBothModified; - /***/ public String switchedToNewBranch; - /***/ public String switchedToBranch; - /***/ public String tagAlreadyExists; - /***/ public String tagLabel; - /***/ public String taggerInfo; - /***/ public String timeInMilliSeconds; - /***/ public String tooManyRefsGiven; - /***/ public String treeIsRequired; - /***/ public char[] unknownIoErrorStdout; - /***/ public String unknownMergeStrategy; - /***/ public String unmergedPaths; - /***/ public String unsupportedOperation; - /***/ public String untrackedFiles; - /***/ public String updating; -} diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java index 953a5e02d5..8115039729 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java @@ -53,6 +53,7 @@ import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.pgm.internal.CLIText; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java index 1ec3888177..888f54da2b 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java @@ -58,6 +58,7 @@ import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.StoredConfig; import org.eclipse.jgit.lib.TextProgressMonitor; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.storage.file.FileRepositoryBuilder; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandRef.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandRef.java index f637abad56..52225150a5 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandRef.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandRef.java @@ -47,6 +47,8 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.text.MessageFormat; +import org.eclipse.jgit.pgm.internal.CLIText; + /** * Description of a command (a {@link TextBuiltin} subclass. *

diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Commit.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Commit.java index a50e744a80..14c449a6b3 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Commit.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Commit.java @@ -48,6 +48,7 @@ import org.eclipse.jgit.api.errors.NoHeadException; import org.eclipse.jgit.api.errors.NoMessageException; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.util.RawParseUtils; import org.kohsuke.args4j.Argument; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java index a5096b0e21..04182d6dbe 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java @@ -50,6 +50,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.Executors; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.storage.file.FileBasedConfig; import org.eclipse.jgit.storage.file.WindowCacheConfig; import org.eclipse.jgit.storage.pack.PackConfig; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java index d38c53ac50..8f051688be 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java @@ -66,6 +66,7 @@ import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.TextProgressMonitor; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.pgm.opt.PathTreeFilterHandler; import org.eclipse.jgit.treewalk.AbstractTreeIterator; import org.eclipse.jgit.treewalk.CanonicalTreeParser; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Glog.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Glog.java index faaf85f76e..8b35fd1751 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Glog.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Glog.java @@ -59,6 +59,7 @@ import javax.swing.JScrollPane; import org.eclipse.jgit.awtui.CommitGraphPane; import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revplot.PlotWalk; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevSort; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Init.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Init.java index ab498873d9..b3e73b5d99 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Init.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Init.java @@ -53,6 +53,7 @@ import java.text.MessageFormat; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.InitCommand; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.pgm.internal.CLIText; import org.kohsuke.args4j.Option; @Command(common = true, usage = "usage_CreateAnEmptyGitRepository") diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java index eaba6e5138..ae0c954157 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java @@ -68,6 +68,7 @@ import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.notes.NoteMap; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevTree; import org.eclipse.jgit.util.GitDateFormatter; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java index 69d7d350cf..b948bc2ebb 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java @@ -59,6 +59,7 @@ import org.eclipse.jgit.awtui.AwtCredentialsProvider; import org.eclipse.jgit.errors.TransportException; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.RepositoryBuilder; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.pgm.opt.CmdLineParser; import org.eclipse.jgit.pgm.opt.SubcommandHandler; import org.eclipse.jgit.util.CachedAuthenticator; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java index 24794e75f2..67b7cc8752 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java @@ -58,6 +58,7 @@ import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.merge.MergeStrategy; import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; import org.kohsuke.args4j.Argument; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java index ea3cac7225..b252de8e60 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java @@ -58,6 +58,7 @@ import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.TextProgressMonitor; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.transport.PushResult; import org.eclipse.jgit.transport.RefSpec; import org.eclipse.jgit.transport.RemoteRefUpdate; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/ReceivePack.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/ReceivePack.java index dd6de1d667..bc8f497164 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/ReceivePack.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/ReceivePack.java @@ -49,6 +49,7 @@ import java.text.MessageFormat; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.lib.RepositoryCache.FileKey; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.util.FS; import org.kohsuke.args4j.Argument; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java index 92a22b00b3..4327403690 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java @@ -55,6 +55,7 @@ import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.pgm.opt.PathTreeFilterHandler; import org.eclipse.jgit.revwalk.FollowFilter; import org.eclipse.jgit.revwalk.ObjectWalk; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Show.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Show.java index 7d6a1713bc..a33a2d4dff 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Show.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Show.java @@ -63,6 +63,7 @@ import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.pgm.opt.PathTreeFilterHandler; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevObject; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java index c1b635ca9f..45cfd92ffd 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java @@ -56,6 +56,7 @@ import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.IndexDiff.StageState; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.pgm.internal.CLIText; @Command(usage = "usage_Status", common = true) class Status extends TextBuiltin { diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Tag.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Tag.java index 23a16ab746..a90d4c4dad 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Tag.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Tag.java @@ -58,6 +58,7 @@ import org.eclipse.jgit.api.errors.RefAlreadyExistsException; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevWalk; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/TextBuiltin.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/TextBuiltin.java index c4e89c3430..dc081439df 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/TextBuiltin.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/TextBuiltin.java @@ -60,6 +60,7 @@ import java.util.ResourceBundle; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.pgm.opt.CmdLineParser; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.util.io.ThrowingPrintWriter; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/UploadPack.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/UploadPack.java index df7f1c3c8c..4ace0aacd7 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/UploadPack.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/UploadPack.java @@ -49,6 +49,7 @@ import java.text.MessageFormat; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.lib.RepositoryCache.FileKey; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.util.FS; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Version.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Version.java index cd7f5116b8..2dce535d9f 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Version.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Version.java @@ -45,6 +45,8 @@ package org.eclipse.jgit.pgm; import java.text.MessageFormat; +import org.eclipse.jgit.pgm.internal.CLIText; + @Command(common = true, usage = "usage_DisplayTheVersionOfJgit") class Version extends TextBuiltin { @Override diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ArchiveCommand.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ArchiveCommand.java index 39b07ec9ae..1235d0ae06 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ArchiveCommand.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/archive/ArchiveCommand.java @@ -63,7 +63,7 @@ import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectLoader; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.pgm.CLIText; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.treewalk.TreeWalk; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java index 663f16c6e4..3efe8845f6 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java @@ -70,8 +70,8 @@ import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.RepositoryBuilder; import org.eclipse.jgit.lib.RepositoryCache; -import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.TextBuiltin; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.treewalk.TreeWalk; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/MakeCacheTree.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/MakeCacheTree.java index 4769f1159d..5e6195e953 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/MakeCacheTree.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/MakeCacheTree.java @@ -51,8 +51,8 @@ import java.text.MessageFormat; import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCacheTree; -import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.TextBuiltin; +import org.eclipse.jgit.pgm.internal.CLIText; class MakeCacheTree extends TextBuiltin { @Override diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ReadDirCache.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ReadDirCache.java index ab4ec2f72b..7cef64b037 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ReadDirCache.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ReadDirCache.java @@ -48,8 +48,8 @@ import static java.lang.Long.valueOf; import java.text.MessageFormat; -import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.TextBuiltin; +import org.eclipse.jgit.pgm.internal.CLIText; class ReadDirCache extends TextBuiltin { @Override diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java index 4b0ab88df6..f25956f802 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java @@ -70,8 +70,8 @@ import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.RefWriter; import org.eclipse.jgit.lib.TextProgressMonitor; -import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.TextBuiltin; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevWalk; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCacheTree.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCacheTree.java index 9fa8c69954..7b0c287575 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCacheTree.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCacheTree.java @@ -51,8 +51,8 @@ import java.text.MessageFormat; import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCacheTree; -import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.TextBuiltin; +import org.eclipse.jgit.pgm.internal.CLIText; class ShowCacheTree extends TextBuiltin { @Override diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCommands.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCommands.java index a0b461d4ee..4f6d1503b3 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCommands.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCommands.java @@ -46,11 +46,11 @@ package org.eclipse.jgit.pgm.debug; import java.net.URL; import org.kohsuke.args4j.Option; -import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.Command; import org.eclipse.jgit.pgm.CommandCatalog; import org.eclipse.jgit.pgm.CommandRef; import org.eclipse.jgit.pgm.TextBuiltin; +import org.eclipse.jgit.pgm.internal.CLIText; @Command(usage = "usage_displayAListOfAllRegisteredJgitCommands") class ShowCommands extends TextBuiltin { diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java index aa46ea114e..e43c9a6af4 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java @@ -64,8 +64,8 @@ import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.RepositoryBuilder; import org.eclipse.jgit.lib.RepositoryCache; -import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.TextBuiltin; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.treewalk.TreeWalk; import org.eclipse.jgit.util.FS; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/WriteDirCache.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/WriteDirCache.java index 142dbeecc8..4adb27671a 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/WriteDirCache.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/WriteDirCache.java @@ -45,8 +45,8 @@ package org.eclipse.jgit.pgm.debug; import org.eclipse.jgit.dircache.DirCache; -import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.TextBuiltin; +import org.eclipse.jgit.pgm.internal.CLIText; class WriteDirCache extends TextBuiltin { @Override diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java new file mode 100644 index 0000000000..62865d51c1 --- /dev/null +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java @@ -0,0 +1,242 @@ +/* + * Copyright (C) 2010, 2013 Sasa Zivkov + * and other copyright owners as documented in the project's IP log. + * + * This program and the accompanying materials are made available + * under the terms of the Eclipse Distribution License v1.0 which + * accompanies this distribution, is reproduced below, and is + * available at http://www.eclipse.org/org/documents/edl-v10.php + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * + * - Neither the name of the Eclipse Foundation, Inc. nor the + * names of its contributors may be used to endorse or promote + * products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.eclipse.jgit.pgm.internal; + +import java.text.MessageFormat; + +import org.eclipse.jgit.nls.NLS; +import org.eclipse.jgit.nls.TranslationBundle; + +/** + * Translation bundle for JGit command line interface + */ +public class CLIText extends TranslationBundle { + + /** + * @return an instance of this translation bundle + */ + public static CLIText get() { + return NLS.getBundleFor(CLIText.class); + } + + /** + * Format the given line for using the format defined by {@link #lineFormat} + * ("# " by default). + * + * @param line + * the line to format + * @return the formatted line + * @since 2.2 + */ + public static String formatLine(String line) { + return MessageFormat.format(get().lineFormat, line); + } + + // @formatter:off + /***/ public String alreadyOnBranch; + /***/ public String alreadyUpToDate; + /***/ public String authorInfo; + /***/ public String averageMSPerRead; + /***/ public String branchAlreadyExists; + /***/ public String branchCreatedFrom; + /***/ public String branchDetachedHEAD; + /***/ public String branchIsNotAnAncestorOfYourCurrentHEAD; + /***/ public String branchNotFound; + /***/ public String cacheTreePathInfo; + /***/ public String configFileNotFound; + /***/ public String cannotBeRenamed; + /***/ public String cannotChekoutNoHeadsAdvertisedByRemote; + /***/ public String cannotCombineSquashWithNoff; + /***/ public String cannotCreateCommand; + /***/ public String cannotCreateOutputStream; + /***/ public String cannotDeatchHEAD; + /***/ public String cannotDeleteFile; + /***/ public String cannotDeleteTheBranchWhichYouAreCurrentlyOn; + /***/ public String cannotGuessLocalNameFrom; + /***/ public String cannotLock; + /***/ public String cannotMergeDetachedHead; + /***/ public String cannotReadBecause; + /***/ public String cannotReadPackageInformation; + /***/ public String cannotRenameDetachedHEAD; + /***/ public String cannotResolve; + /***/ public String cannotSetupConsole; + /***/ public String cannotUseObjectsWithGlog; + /***/ public String cantFindGitDirectory; + /***/ public String cantWrite; + /***/ public String changesNotStagedForCommit; + /***/ public String changesToBeCommitted; + /***/ public String commitLabel; + /***/ public String conflictingUsageOf_git_dir_andArguments; + /***/ public String couldNotCreateBranch; + /***/ public String dateInfo; + /***/ public String deletedBranch; + /***/ public String deletedRemoteBranch; + /***/ public String doesNotExist; + /***/ public String dontOverwriteLocalChanges; + /***/ public String everythingUpToDate; + /***/ public String exceptionCaughtDuringExecutionOfArchiveCommand; + /***/ public String expectedNumberOfbytes; + /***/ public String exporting; + /***/ public String failedToCommitIndex; + /***/ public String failedToLockIndex; + /***/ public String failedToLockTag; + /***/ public String fatalError; + /***/ public String fatalThisProgramWillDestroyTheRepository; + /***/ public String fileIsRequired; + /***/ public String ffNotPossibleAborting; + /***/ public String forcedUpdate; + /***/ public String fromURI; + /***/ public String initializedEmptyGitRepositoryIn; + /***/ public String invalidHttpProxyOnlyHttpSupported; + /***/ public String jgitVersion; + /***/ public String lineFormat; + /***/ public String listeningOn; + /***/ public String mergeCheckoutConflict; + /***/ public String mergeConflict; + /***/ public String mergeFailed; + /***/ public String mergeCheckoutFailed; + /***/ public String mergeMadeBy; + /***/ public String mergedSquashed; + /***/ public String mergeWentWellStoppedBeforeCommitting; + /***/ public String metaVar_KEY; + /***/ public String metaVar_archiveFormat; + /***/ public String metaVar_arg; + /***/ public String metaVar_author; + /***/ public String metaVar_bucket; + /***/ public String metaVar_command; + /***/ public String metaVar_commandDetail; + /***/ public String metaVar_commitOrTag; + /***/ public String metaVar_commitPaths; + /***/ public String metaVar_commitish; + /***/ public String metaVar_configFile; + /***/ public String metaVar_connProp; + /***/ public String metaVar_diffAlg; + /***/ public String metaVar_directory; + /***/ public String metaVar_file; + /***/ public String metaVar_filepattern; + /***/ public String metaVar_gitDir; + /***/ public String metaVar_hostName; + /***/ public String metaVar_linesOfContext; + /***/ public String metaVar_message; + /***/ public String metaVar_n; + /***/ public String metaVar_name; + /***/ public String metaVar_object; + /***/ public String metaVar_op; + /***/ public String metaVar_pass; + /***/ public String metaVar_path; + /***/ public String metaVar_paths; + /***/ public String metaVar_port; + /***/ public String metaVar_ref; + /***/ public String metaVar_refs; + /***/ public String metaVar_refspec; + /***/ public String metaVar_remoteName; + /***/ public String metaVar_seconds; + /***/ public String metaVar_service; + /***/ public String metaVar_treeish; + /***/ public String metaVar_uriish; + /***/ public String metaVar_url; + /***/ public String metaVar_user; + /***/ public String metaVar_version; + /***/ public String mostCommonlyUsedCommandsAre; + /***/ public String needApprovalToDestroyCurrentRepository; + /***/ public String noGitRepositoryConfigured; + /***/ public String noSuchFile; + /***/ public String noSuchRemoteRef; + /***/ public String noTREESectionInIndex; + /***/ public String nonFastForward; + /***/ public String notABranch; + /***/ public String notACommit; + /***/ public String notAGitRepository; + /***/ public String notAJgitCommand; + /***/ public String notARevision; + /***/ public String notATree; + /***/ public String notAValidRefName; + /***/ public String notAnIndexFile; + /***/ public String notAnObject; + /***/ public String notFound; + /***/ public String notOnAnyBranch; + /***/ public String noteObjectTooLargeToPrint; + /***/ public String nothingToSquash; + /***/ public String onBranchToBeBorn; + /***/ public String onBranch; + /***/ public String onlyOneMetaVarExpectedIn; + /***/ public String onlyOneOfIncludeOnlyAllInteractiveCanBeUsed; + /***/ public String pathspecDidNotMatch; + /***/ public String pushTo; + /***/ public String pathsRequired; + /***/ public String refDoesNotExistOrNoCommit; + /***/ public String remoteMessage; + /***/ public String remoteRefObjectChangedIsNotExpectedOne; + /***/ public String remoteSideDoesNotSupportDeletingRefs; + /***/ public String repaint; + /***/ public String serviceNotSupported; + /***/ public String skippingObject; + /***/ public String statusFileListFormat; + /***/ public String statusFileListFormatWithPrefix; + /***/ public String statusFileListFormatUnmerged; + /***/ public String statusModified; + /***/ public String statusNewFile; + /***/ public String statusRemoved; + /***/ public String statusBothDeleted; + /***/ public String statusAddedByUs; + /***/ public String statusDeletedByThem; + /***/ public String statusAddedByThem; + /***/ public String statusDeletedByUs; + /***/ public String statusBothAdded; + /***/ public String statusBothModified; + /***/ public String switchedToNewBranch; + /***/ public String switchedToBranch; + /***/ public String tagAlreadyExists; + /***/ public String tagLabel; + /***/ public String taggerInfo; + /***/ public String timeInMilliSeconds; + /***/ public String tooManyRefsGiven; + /***/ public String treeIsRequired; + /***/ public char[] unknownIoErrorStdout; + /***/ public String unknownMergeStrategy; + /***/ public String unmergedPaths; + /***/ public String unsupportedOperation; + /***/ public String untrackedFiles; + /***/ public String updating; +} diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/AbstractTreeIteratorHandler.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/AbstractTreeIteratorHandler.java index ca9710491c..087dbb0679 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/AbstractTreeIteratorHandler.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/AbstractTreeIteratorHandler.java @@ -60,7 +60,7 @@ import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectReader; -import org.eclipse.jgit.pgm.CLIText; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.treewalk.AbstractTreeIterator; import org.eclipse.jgit.treewalk.CanonicalTreeParser; import org.eclipse.jgit.treewalk.FileTreeIterator; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java index cea32099e2..c36cc2cb44 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java @@ -56,8 +56,8 @@ import org.kohsuke.args4j.spi.OptionHandler; import org.kohsuke.args4j.spi.Setter; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.TextBuiltin; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevTree; import org.eclipse.jgit.revwalk.RevWalk; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/ObjectIdHandler.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/ObjectIdHandler.java index f6550a5d88..fa24d4b02f 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/ObjectIdHandler.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/ObjectIdHandler.java @@ -54,7 +54,7 @@ import org.kohsuke.args4j.spi.OptionHandler; import org.kohsuke.args4j.spi.Parameters; import org.kohsuke.args4j.spi.Setter; import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.pgm.CLIText; +import org.eclipse.jgit.pgm.internal.CLIText; /** * Custom argument handler {@link ObjectId} from string values. diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/PathTreeFilterHandler.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/PathTreeFilterHandler.java index 50ff02aca9..122cce7dea 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/PathTreeFilterHandler.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/PathTreeFilterHandler.java @@ -53,7 +53,7 @@ import org.kohsuke.args4j.OptionDef; import org.kohsuke.args4j.spi.OptionHandler; import org.kohsuke.args4j.spi.Parameters; import org.kohsuke.args4j.spi.Setter; -import org.eclipse.jgit.pgm.CLIText; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.treewalk.filter.PathFilter; import org.eclipse.jgit.treewalk.filter.PathFilterGroup; import org.eclipse.jgit.treewalk.filter.TreeFilter; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RefSpecHandler.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RefSpecHandler.java index 43b727ac02..dae0c47642 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RefSpecHandler.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RefSpecHandler.java @@ -49,7 +49,7 @@ import org.kohsuke.args4j.OptionDef; import org.kohsuke.args4j.spi.OptionHandler; import org.kohsuke.args4j.spi.Parameters; import org.kohsuke.args4j.spi.Setter; -import org.eclipse.jgit.pgm.CLIText; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.transport.RefSpec; /** diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevCommitHandler.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevCommitHandler.java index 4d917dcbd3..b1be128db1 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevCommitHandler.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevCommitHandler.java @@ -56,7 +56,7 @@ import org.kohsuke.args4j.spi.Setter; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.pgm.CLIText; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevFlag; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevTreeHandler.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevTreeHandler.java index 0b607ee06f..eb155af9f4 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevTreeHandler.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevTreeHandler.java @@ -56,7 +56,7 @@ import org.kohsuke.args4j.spi.Setter; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.pgm.CLIText; +import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.revwalk.RevTree; /** diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/SubcommandHandler.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/SubcommandHandler.java index 35ed22bd30..c62ef0d2b8 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/SubcommandHandler.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/SubcommandHandler.java @@ -51,10 +51,10 @@ import org.kohsuke.args4j.OptionDef; import org.kohsuke.args4j.spi.OptionHandler; import org.kohsuke.args4j.spi.Parameters; import org.kohsuke.args4j.spi.Setter; -import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.CommandCatalog; import org.eclipse.jgit.pgm.CommandRef; import org.eclipse.jgit.pgm.TextBuiltin; +import org.eclipse.jgit.pgm.internal.CLIText; /** * Custom Argument handler for jgit command selection. diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 3a709d6d21..cd81fd6ba7 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -30,6 +30,7 @@ Import-Package: javaewah;version="0.5.6", org.eclipse.jgit.notes;version="[3.0.0,3.1.0)", org.eclipse.jgit.patch;version="[3.0.0,3.1.0)", org.eclipse.jgit.pgm;version="[3.0.0,3.1.0)", + org.eclipse.jgit.pgm.internal;version="[3.0.0,3.1.0)", org.eclipse.jgit.revplot;version="[3.0.0,3.1.0)", org.eclipse.jgit.revwalk;version="[3.0.0,3.1.0)", org.eclipse.jgit.revwalk.filter;version="[3.0.0,3.1.0)", diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/RootLocaleTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/RootLocaleTest.java index 1a1482c886..cae006c94e 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/RootLocaleTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/nls/RootLocaleTest.java @@ -46,7 +46,7 @@ package org.eclipse.jgit.nls; import org.eclipse.jgit.awtui.UIText; import org.eclipse.jgit.console.ConsoleText; import org.eclipse.jgit.internal.JGitText; -import org.eclipse.jgit.pgm.CLIText; +import org.eclipse.jgit.pgm.internal.CLIText; import org.junit.Before; import org.junit.Test; -- cgit v1.2.3