[JGIT PATCH 20/28] Convert index-pack program to args4j

From

Shawn O. Pearce <spearce@spearce.org>

Date

Jul 18, 2008, 01:44 UTC

Message-ID

<1216345461-59382-21-git-send-email-spearce@spearce.org>

In-Reply-To

<1216345461-59382-20-git-send-email-spearce@spearce.org>

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 .../src/org/spearce/jgit/pgm/IndexPack.java        |   35 +++++++-------------
 1 files 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 5f4134d..5eacaa4 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());
 	}
 }

-- 
1.5.6.3.569.ga9185