From 9cb8192d1986befd56fb371269eee308c4f50998 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 2 Oct 2016 01:13:53 +0200 Subject: [PATCH 1/3] Remove wrong junit dependencies in org.eclipse.jgit.pgm Bug: 503010 Change-Id: I8fa99f53020af41eb15c1f63b6f3ba094d56bfef Signed-off-by: Matthias Sohn --- org.eclipse.jgit.pgm/pom.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index dd4aa9ba3..99945abe9 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -128,17 +128,6 @@ jetty-servlet - - junit - junit - - - - org.eclipse.jgit - org.eclipse.jgit.junit.http - ${project.version} - - org.eclipse.jgit org.eclipse.jgit.lfs From d2312f2921089f25979798a93294d05398a0a062 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 24 Sep 2016 10:50:21 +0200 Subject: [PATCH 2/3] Add missing online help for Ketch server type option in CLI daemon Change-Id: I19d27bbdbfdb1c7a5a688e41dfcba73a142a1afd Signed-off-by: Matthias Sohn --- .../resources/org/eclipse/jgit/pgm/internal/CLIText.properties | 2 ++ org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 f3a42c385..1d4bf76b9 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 @@ -114,6 +114,7 @@ metaVar_file=FILE metaVar_filepattern=filepattern metaVar_gitDir=GIT_DIR metaVar_hostName=HOSTNAME +metaVar_ketchServerType=SERVERTYPE metaVar_lfsStorage=STORAGE metaVar_linesOfContext=lines metaVar_message=message @@ -232,6 +233,7 @@ usage_DisplayTheVersionOfJgit=Display the version of jgit usage_Gc=Cleanup unnecessary files and optimize the local repository usage_Glog=View commit history as a graph usage_IndexPack=Build pack index file for an existing packed archive +usage_ketchServerType=Ketch server type usage_LFSDirectory=Directory to store large objects usage_LFSPort=Server http port usage_LFSRunStore=Store (fs | s3), store lfs objects in file system or Amazon S3 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 03f3fac0b..a7bdde9f6 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 @@ -101,7 +101,7 @@ class Daemon extends TextBuiltin { @Option(name = "--export-all", usage = "usage_exportWithoutGitDaemonExportOk") boolean exportAll; - @Option(name = "--ketch") + @Option(name = "--ketch", metaVar = "metaVar_ketchServerType", usage = "usage_ketchServerType") KetchServerType ketchServerType; enum KetchServerType { From 15341ce5777c25dd41a52cf4b633ba363e3bf7a2 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 25 Sep 2016 11:46:09 +0200 Subject: [PATCH 3/3] pgm: Fix misspelled key of an externalized string Bug: 502107 Change-Id: I76d0981c8463b63bd049f50cdc7d549fa0604b3c Signed-off-by: Matthias Sohn --- org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clean.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clean.java index fa94d2c1c..ce4faf83a 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clean.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clean.java @@ -50,7 +50,7 @@ import org.eclipse.jgit.api.Git; import org.eclipse.jgit.pgm.internal.CLIText; import org.kohsuke.args4j.Option; -@Command(common = true, usage = "usage_clean") +@Command(common = true, usage = "usage_Clean") class Clean extends TextBuiltin { @Option(name = "-d", usage = "usage_removeUntrackedDirectories") private boolean dirs = false;