Fixed help of Diff and ShowCommands commands

jgit.sh <command> --help was not working for the commands Diff
and ShowCommands because of missing metaVar information. Missing
information is added here.

Change-Id: I0ab7e35006b6aa7d4326a634309dddfcdb78f2a6
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>

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
index c4498c677130708009b5161ccb9dfb4ebc8dca20..f709e15ffe89d5f4cc679ff6b9b4e878e1b7133f 100644 (file)
--- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
+++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
@@ -61,10 +61,12 @@ metaVar_author=AUTHOR
 metaVar_base=base
 metaVar_bucket=BUCKET
 metaVar_command=command
+metaVar_commandDetail=DETAIL
 metaVar_commitOrTag=COMMIT|TAG
 metaVar_commitish=commit-ish
 metaVar_configFile=FILE
 metaVar_connProp=conn.prop
+metaVar_diffAlg=ALGORITHM
 metaVar_directory=DIRECTORY
 metaVar_file=FILE
 metaVar_filepattern=filepattern
@@ -149,7 +151,7 @@ usage_configureTheServiceInDaemonServicename=configure the service in daemon.ser
 usage_deleteBranchEvenIfNotMerged=delete branch (even if not merged)
 usage_deleteFullyMergedBranch=delete fully merged branch
 usage_detectRenames=detect renamed files
-usage_diffAlgorithm=the diff algorithm to use
+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

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 19d11d629e6a257f5a173b9d0bac91feff537b98..6062f35827c7d9d235f55302ce10340fc4f97c75 100644 (file)
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java
@@ -111,7 +111,7 @@ class Diff extends TextBuiltin {
                }
        };
 
-       @Option(name = "--algorithm", usage = "usage_diffAlgorithm")
+       @Option(name = "--algorithm", metaVar = "metaVar_diffAlg", usage = "usage_diffAlgorithm")
        void setAlgorithm(SupportedAlgorithm s) {
                diffFmt.setDiffAlgorithm(s.algorithm);
        }

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 78fc1453d16a532eb301282326385fe1c07aec74..e96e6543c645ccd90be8c42caa01e7e44423fc10 100644 (file)
--- 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
@@ -54,7 +54,7 @@ import org.eclipse.jgit.pgm.TextBuiltin;
 
 @Command(usage = "usage_displayAListOfAllRegisteredJgitCommands")
 class ShowCommands extends TextBuiltin {
-       @Option(name = "--pretty", usage = "usage_alterTheDetailShown")
+       @Option(name = "--pretty", metaVar = "metaVar_commandDetail", usage = "usage_alterTheDetailShown")
        private Format pretty = Format.USAGE;
 
        @Override