Merge branch 'stable-4.5'
* stable-4.5: pgm: Fix misspelled key of an externalized string Add missing online help for Ketch server type option in CLI daemon Remove wrong junit dependencies in org.eclipse.jgit.pgm Change-Id: I9cac024c0b488101b539c713b0f5ffc8c01b55bd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
commit
8f6b75f7ad
|
@ -128,17 +128,6 @@
|
||||||
<artifactId>jetty-servlet</artifactId>
|
<artifactId>jetty-servlet</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>junit</groupId>
|
|
||||||
<artifactId>junit</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jgit</groupId>
|
|
||||||
<artifactId>org.eclipse.jgit.junit.http</artifactId>
|
|
||||||
<version>${project.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.eclipse.jgit</groupId>
|
<groupId>org.eclipse.jgit</groupId>
|
||||||
<artifactId>org.eclipse.jgit.lfs</artifactId>
|
<artifactId>org.eclipse.jgit.lfs</artifactId>
|
||||||
|
|
|
@ -114,6 +114,7 @@ metaVar_file=FILE
|
||||||
metaVar_filepattern=filepattern
|
metaVar_filepattern=filepattern
|
||||||
metaVar_gitDir=GIT_DIR
|
metaVar_gitDir=GIT_DIR
|
||||||
metaVar_hostName=HOSTNAME
|
metaVar_hostName=HOSTNAME
|
||||||
|
metaVar_ketchServerType=SERVERTYPE
|
||||||
metaVar_lfsStorage=STORAGE
|
metaVar_lfsStorage=STORAGE
|
||||||
metaVar_linesOfContext=lines
|
metaVar_linesOfContext=lines
|
||||||
metaVar_message=message
|
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_Gc=Cleanup unnecessary files and optimize the local repository
|
||||||
usage_Glog=View commit history as a graph
|
usage_Glog=View commit history as a graph
|
||||||
usage_IndexPack=Build pack index file for an existing packed archive
|
usage_IndexPack=Build pack index file for an existing packed archive
|
||||||
|
usage_ketchServerType=Ketch server type
|
||||||
usage_LFSDirectory=Directory to store large objects
|
usage_LFSDirectory=Directory to store large objects
|
||||||
usage_LFSPort=Server http port
|
usage_LFSPort=Server http port
|
||||||
usage_LFSRunStore=Store (fs | s3), store lfs objects in file system or Amazon S3
|
usage_LFSRunStore=Store (fs | s3), store lfs objects in file system or Amazon S3
|
||||||
|
|
|
@ -50,7 +50,7 @@
|
||||||
import org.eclipse.jgit.pgm.internal.CLIText;
|
import org.eclipse.jgit.pgm.internal.CLIText;
|
||||||
import org.kohsuke.args4j.Option;
|
import org.kohsuke.args4j.Option;
|
||||||
|
|
||||||
@Command(common = true, usage = "usage_clean")
|
@Command(common = true, usage = "usage_Clean")
|
||||||
class Clean extends TextBuiltin {
|
class Clean extends TextBuiltin {
|
||||||
@Option(name = "-d", usage = "usage_removeUntrackedDirectories")
|
@Option(name = "-d", usage = "usage_removeUntrackedDirectories")
|
||||||
private boolean dirs = false;
|
private boolean dirs = false;
|
||||||
|
|
|
@ -101,7 +101,7 @@ class Daemon extends TextBuiltin {
|
||||||
@Option(name = "--export-all", usage = "usage_exportWithoutGitDaemonExportOk")
|
@Option(name = "--export-all", usage = "usage_exportWithoutGitDaemonExportOk")
|
||||||
boolean exportAll;
|
boolean exportAll;
|
||||||
|
|
||||||
@Option(name = "--ketch")
|
@Option(name = "--ketch", metaVar = "metaVar_ketchServerType", usage = "usage_ketchServerType")
|
||||||
KetchServerType ketchServerType;
|
KetchServerType ketchServerType;
|
||||||
|
|
||||||
enum KetchServerType {
|
enum KetchServerType {
|
||||||
|
|
Loading…
Reference in New Issue