Browse Source

Merge "Add support for --version in JGit CLI"

stable-3.2
Robin Stocker 11 years ago committed by Gerrit Code Review @ Eclipse.org
parent
commit
ec56d0d82a
  1. 1
      org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties
  2. 10
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java

1
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_displayAllPossibleMergeBases=display all possible merge bases
usage_displayThejavaStackTraceOnExceptions=display the Java stack trace on exceptions usage_displayThejavaStackTraceOnExceptions=display the Java stack trace on exceptions
usage_displayThisHelpText=display this help text usage_displayThisHelpText=display this help text
usage_displayVersion=display jgit version
usage_dstPrefix=show the destination prefix instead of "b/" usage_dstPrefix=show the destination prefix instead of "b/"
usage_enableTheServiceInAllRepositories=enable the service in all repositories usage_enableTheServiceInAllRepositories=enable the service in all repositories
usage_exportRepositoriesOverGit=Export repositories over git:// usage_exportRepositoriesOverGit=Export repositories over git://

10
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" }) @Option(name = "--help", usage = "usage_displayThisHelpText", aliases = { "-h" })
private boolean help; private boolean help;
@Option(name = "--version", usage = "usage_displayVersion")
private boolean version;
@Option(name = "--show-stack-trace", usage = "usage_displayThejavaStackTraceOnExceptions") @Option(name = "--show-stack-trace", usage = "usage_displayThejavaStackTraceOnExceptions")
private boolean showStackTrace; private boolean showStackTrace;
@ -167,7 +170,7 @@ public class Main {
try { try {
clp.parseArgument(argv); clp.parseArgument(argv);
} catch (CmdLineException err) { } catch (CmdLineException err) {
if (argv.length > 0 && !help) { if (argv.length > 0 && !help && !version) {
writer.println(MessageFormat.format(CLIText.get().fatalError, err.getMessage())); writer.println(MessageFormat.format(CLIText.get().fatalError, err.getMessage()));
writer.flush(); writer.flush();
System.exit(1); System.exit(1);
@ -204,6 +207,11 @@ public class Main {
System.exit(1); System.exit(1);
} }
if (version) {
String cmdId = Version.class.getSimpleName().toLowerCase();
subcommand = CommandCatalog.get(cmdId).create();
}
final TextBuiltin cmd = subcommand; final TextBuiltin cmd = subcommand;
if (cmd.requiresRepository()) if (cmd.requiresRepository())
cmd.init(openGitDir(gitdir), null); cmd.init(openGitDir(gitdir), null);

Loading…
Cancel
Save