From 29b8634e09aedd1b57411865af86ec2eb1349b82 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Thu, 17 Jul 2008 19:32:20 -0400 Subject: [PATCH] Convert index-pack program to args4j Signed-off-by: Shawn O. Pearce --- .../src/org/spearce/jgit/pgm/IndexPack.java | 35 ++++++++-------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/IndexPack.java b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/IndexPack.java index 5f4134d2..5eacaa4c 100644 --- a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/IndexPack.java +++ b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/IndexPack.java @@ -40,39 +40,28 @@ package org.spearce.jgit.pgm; import java.io.BufferedInputStream; import java.io.File; +import org.kohsuke.args4j.Argument; +import org.kohsuke.args4j.Option; import org.spearce.jgit.lib.TextProgressMonitor; class IndexPack extends TextBuiltin { - @Override - public void execute(final String[] args) throws Exception { - boolean fixThin = false; - int argi = 0; - int version = 0; - for (; argi < args.length; argi++) { - final String a = args[argi]; - if ("--fix-thin".equals(a)) - fixThin = true; - else if (a.startsWith("--index-version=")) - version = Integer.parseInt(a.substring(a.indexOf('=') + 1)); - else if ("--".equals(a)) { - argi++; - break; - } else - break; - } + @Option(name = "--fix-thin", usage = "fix a thin pack to be complete") + private boolean fixThin; + + @Option(name = "--index-version", usage = "index file format to create") + private int indexVersion; - if (argi == args.length) - throw die("usage: index-pack base"); - else if (argi + 1 < args.length) - throw die("too many arguments"); + @Argument(index = 0, required = true, metaVar = "base") + private File base; - final File base = new File(args[argi]); + @Override + protected void run() throws Exception { final BufferedInputStream in; final org.spearce.jgit.transport.IndexPack ip; in = new BufferedInputStream(System.in); ip = new org.spearce.jgit.transport.IndexPack(db, in, base); ip.setFixThin(fixThin); - ip.setIndexVersion(version); + ip.setIndexVersion(indexVersion); ip.index(new TextProgressMonitor()); } } -- 2.11.4.GIT