[JGIT PATCH 23/28] Convert merge-base program to args4j

From

Shawn O. Pearce <spearce@spearce.org>

Date

Jul 18, 2008, 01:44 UTC

Message-ID

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

In-Reply-To

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

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 .../src/org/spearce/jgit/pgm/MergeBase.java        |   37 ++++++++++++--------
 1 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/MergeBase.java b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/MergeBase.java
index c1648a0..c0ddd3b 100644
--- a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/MergeBase.java
+++ b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/MergeBase.java
@@ -37,27 +37,34 @@
 
 package org.spearce.jgit.pgm;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.kohsuke.args4j.Argument;
+import org.kohsuke.args4j.Option;
 import org.spearce.jgit.revwalk.RevCommit;
-import org.spearce.jgit.revwalk.RevWalk;
 import org.spearce.jgit.revwalk.filter.RevFilter;
 
 class MergeBase extends TextBuiltin {
-	@Override
-	public void execute(final String[] args) throws Exception {
-		final RevWalk walk = new RevWalk(db);
-		int max = 1;
-		for (final String a : args) {
-			if ("--".equals(a))
-				break;
-			else if ("--all".equals(a))
-				max = Integer.MAX_VALUE;
-			else
-				walk.markStart(walk.parseCommit(resolve(a)));
-		}
+	@Option(name = "--all", usage = "display all possible merge bases")
+	private boolean all;
 
-		walk.setRevFilter(RevFilter.MERGE_BASE);
+	@Argument(index = 0, metaVar = "commit-ish", required = true)
+	void commit_0(final RevCommit c) {
+		commits.add(c);
+	}
+
+	@Argument(index = 1, metaVar = "commit-ish", required = true)
+	private final List<RevCommit> commits = new ArrayList<RevCommit>();
+
+	@Override
+	protected void run() throws Exception {
+		for (final RevCommit c : commits)
+			argWalk.markStart(c);
+		argWalk.setRevFilter(RevFilter.MERGE_BASE);
+		int max = all ? Integer.MAX_VALUE : 1;
 		while (max-- > 0) {
-			final RevCommit b = walk.next();
+			final RevCommit b = argWalk.next();
 			if (b == null)
 				break;
 			out.println(b.getId());

-- 
1.5.6.3.569.ga9185