aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaloyan Raev2013-10-09 06:52:47 (EDT)
committerKaloyan Raev2013-10-09 13:37:03 (EDT)
commit2c969ea00b7267c266d0e9a6bc883c1d9ec645f1 (patch)
treee3f91ed4732410e50598a9859c17a5a3235625d6
parent06ddee1c3f1ca1a7aa5180e0a0e3670e1849153a (diff)
downloadjgit-2c969ea00b7267c266d0e9a6bc883c1d9ec645f1.zip
jgit-2c969ea00b7267c266d0e9a6bc883c1d9ec645f1.tar.gz
jgit-2c969ea00b7267c266d0e9a6bc883c1d9ec645f1.tar.bz2
Add support for --version in JGit CLIrefs/changes/30/17230/1
Bug: 419000 Change-Id: I43f5267182ea69d1f9abbff33136e0491c629071 Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com>
-rw-r--r--org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties1
-rw-r--r--org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java10
2 files changed, 10 insertions, 1 deletions
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
index bda8f78..5154e08 100644
--- 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
@@ -258,6 +258,7 @@ usage_displayAListOfAllRegisteredJgitCommands=Display a list of all registered j
usage_displayAllPossibleMergeBases=display all possible merge bases
usage_displayThejavaStackTraceOnExceptions=display the Java stack trace on exceptions
usage_displayThisHelpText=display this help text
+usage_displayVersion=display jgit version
usage_dstPrefix=show the destination prefix instead of "b/"
usage_enableTheServiceInAllRepositories=enable the service in all repositories
usage_exportRepositoriesOverGit=Export repositories over git://
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 b948bc2..3648ffd 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
@@ -73,6 +73,9 @@ public class Main {
@Option(name = "--help", usage = "usage_displayThisHelpText", aliases = { "-h" })
private boolean help;
+ @Option(name = "--version", usage = "usage_displayVersion")
+ private boolean version;
+
@Option(name = "--show-stack-trace", usage = "usage_displayThejavaStackTraceOnExceptions")
private boolean showStackTrace;
@@ -167,7 +170,7 @@ public class Main {
try {
clp.parseArgument(argv);
} catch (CmdLineException err) {
- if (argv.length > 0 && !help) {
+ if (argv.length > 0 && !help && !version) {
writer.println(MessageFormat.format(CLIText.get().fatalError, err.getMessage()));
writer.flush();
System.exit(1);
@@ -204,6 +207,11 @@ public class Main {
System.exit(1);
}
+ if (version) {
+ String cmdId = Version.class.getSimpleName().toLowerCase();
+ subcommand = CommandCatalog.get(cmdId).create();
+ }
+
final TextBuiltin cmd = subcommand;
if (cmd.requiresRepository())
cmd.init(openGitDir(gitdir), null);