[JGIT PATCH 19/28] Convert fetch program to args4j

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Shawn O. Pearce <spearce@xxxxxxxxxxx>
---
 .../src/org/spearce/jgit/pgm/Fetch.java            |   27 ++++++-------------
 1 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Fetch.java b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Fetch.java
index e5a0dce..194f669 100644
--- a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Fetch.java
+++ b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Fetch.java
@@ -37,9 +37,9 @@
 
 package org.spearce.jgit.pgm;
 
-import java.util.ArrayList;
 import java.util.List;
 
+import org.kohsuke.args4j.Argument;
 import org.spearce.jgit.lib.RefUpdate;
 import org.spearce.jgit.lib.TextProgressMonitor;
 import org.spearce.jgit.transport.FetchResult;
@@ -48,26 +48,17 @@ import org.spearce.jgit.transport.TrackingRefUpdate;
 import org.spearce.jgit.transport.Transport;
 
 class Fetch extends TextBuiltin {
-	@Override
-	public void execute(String[] args) throws Exception {
-		int argi = 0;
-		for (; argi < args.length; argi++) {
-			final String a = args[argi];
-			if ("--".equals(a)) {
-				argi++;
-				break;
-			} else
-				break;
-		}
-		if (args.length == 0)
-			args = new String[] { "origin" };
+	@Argument(index = 0, metaVar = "uri-ish")
+	private String remote = "origin";
 
-		final Transport tn = Transport.open(db, args[argi++]);
+	@Argument(index = 1, metaVar = "refspec")
+	private List<RefSpec> toget;
+
+	@Override
+	protected void run() throws Exception {
+		final Transport tn = Transport.open(db, remote);
 		final FetchResult r;
 		try {
-			final List<RefSpec> toget = new ArrayList<RefSpec>();
-			for (; argi < args.length; argi++)
-				toget.add(new RefSpec(args[argi]));
 			r = tn.fetch(new TextProgressMonitor(), toget);
 			if (r.getTrackingRefUpdates().isEmpty())
 				return;
-- 
1.5.6.3.569.ga9185

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux