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)",
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;
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.jgit.pgm" version="2">
- <resource path="src/org/eclipse/jgit/pgm/CLIText.java" type="org.eclipse.jgit.pgm.CLIText">
- <filter id="1143996420">
- <message_arguments>
- <message_argument value="mergeWentWellStoppedBeforeCommitting"/>
- </message_arguments>
- </filter>
- <filter id="1143996420">
- <message_arguments>
- <message_argument value="noSuchRemoteRef"/>
- </message_arguments>
- </filter>
- </resource>
-</component>
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
+++ /dev/null
-# 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 <author@example.com> format.
-usage_CommitMessage=Use the given <msg> 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 <filepattern> 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 <name> instead of 'origin' to track upstream
-usage_checkoutBranchAfterClone=checkout named branch instead of remotes's HEAD
-usage_viewCommitHistory=View commit history
--- /dev/null
+# 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 <author@example.com> format.
+usage_CommitMessage=Use the given <msg> 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 <filepattern> 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 <name> instead of 'origin' to track upstream
+usage_checkoutBranchAfterClone=checkout named branch instead of remotes's HEAD
+usage_viewCommitHistory=View commit history
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;
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;
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;
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;
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;
+++ /dev/null
-/*
- * Copyright (C) 2010, 2013 Sasa Zivkov <sasa.zivkov@sap.com>
- * 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;
-}
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;
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;
import java.lang.reflect.InvocationTargetException;
import java.text.MessageFormat;
+import org.eclipse.jgit.pgm.internal.CLIText;
+
/**
* Description of a command (a {@link TextBuiltin} subclass.
* <p>
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;
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;
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;
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;
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")
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;
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;
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;
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;
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.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;
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;
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 {
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;
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;
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;
import java.text.MessageFormat;
+import org.eclipse.jgit.pgm.internal.CLIText;
+
@Command(common = true, usage = "usage_DisplayTheVersionOfJgit")
class Version extends TextBuiltin {
@Override
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;
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;
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
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
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;
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
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 {
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;
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
--- /dev/null
+/*
+ * Copyright (C) 2010, 2013 Sasa Zivkov <sasa.zivkov@sap.com>
+ * 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;
+}
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;
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;
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.
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;
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;
/**
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;
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;
/**
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.
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)",
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;
projects / jgit.git / commitdiff