[PATCH EGIT 1/2] Implement "jgit rev-parse"

[PATCH EGIT 1/2] Implement "jgit rev-parse"

[Daniel Cheng (aka SDiZ)]

Signed-off-by: Daniel Cheng (aka SDiZ) <git@sdiz.net>
---
 .../services/org.spearce.jgit.pgm.TextBuiltin      |    1 +
 .../src/org/spearce/jgit/pgm/RevParse.java         |   70 ++++++++++++++++++++
 2 files changed, 71 insertions(+), 0 deletions(-)
 create mode 100644 org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/RevParse.java

diff --git a/org.spearce.jgit.pgm/src/META-INF/services/org.spearce.jgit.pgm.TextBuiltin b/org.spearce.jgit.pgm/src/META-INF/services/org.spearce.jgit.pgm.TextBuiltin
index 2fe6612..7e24516 100644
--- a/org.spearce.jgit.pgm/src/META-INF/services/org.spearce.jgit.pgm.TextBuiltin
+++ b/org.spearce.jgit.pgm/src/META-INF/services/org.spearce.jgit.pgm.TextBuiltin
@@ -13,6 +13,7 @@ org.spearce.jgit.pgm.MergeBase
 org.spearce.jgit.pgm.Push
 org.spearce.jgit.pgm.ReceivePack
 org.spearce.jgit.pgm.RevList
+org.spearce.jgit.pgm.RevParse
 org.spearce.jgit.pgm.Rm
 org.spearce.jgit.pgm.ShowRev
 org.spearce.jgit.pgm.Tag
diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/RevParse.java b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/RevParse.java
new file mode 100644
index 0000000..9cd6e95
--- /dev/null
+++ b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/RevParse.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2009, Daniel Cheng (aka SDiZ) <git@sdiz.net>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following
+ *   disclaimer in the documentation and/or other materials provided
+ *   with the distribution.
+ *
+ * - Neither the name of the Git Development Community nor the
+ *   names of its contributors may be used to endorse or promote
+ *   products derived from this software without specific prior
+ *   written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.spearce.jgit.pgm;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.kohsuke.args4j.Argument;
+import org.kohsuke.args4j.Option;
+import org.spearce.jgit.lib.ObjectId;
+import org.spearce.jgit.lib.Ref;
+import org.spearce.jgit.revwalk.RevWalk;
+
+class RevParse extends TextBuiltin {
+	RevWalk walk;
+
+	@Option(name = "--all")
+	boolean all = false;
+
+	@Argument(index = 0, metaVar = "commit-ish")
+	private final List<ObjectId> commits = new ArrayList<ObjectId>();
+
+	@Override
+	protected void run() throws Exception {
+		if (all) {
+			Map<String, Ref> allRefs = db.getAllRefs();
+			for (final Ref r : allRefs.values())
+				System.out.println(r.getObjectId().name());
+		} else {
+			for (final ObjectId o : commits)
+				System.out.println(o.name());
+		}
+	}
+}
-- 
1.6.2.1

[PATCH EGIT 2/2] Enable "jgit show-ref"

[Daniel Cheng (aka SDiZ)]

Signed-off-by: Daniel Cheng (aka SDiZ) <git@sdiz.net>
---
org.spearce.jgit.pgm.ShowRef exists, but never enabled.
this patch enable this command


 .../services/org.spearce.jgit.pgm.TextBuiltin      |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/org.spearce.jgit.pgm/src/META-INF/services/org.spearce.jgit.pgm.TextBuiltin b/org.spearce.jgit.pgm/src/META-INF/services/org.spearce.jgit.pgm.TextBuiltin
index 7e24516..3a8cc09 100644
--- a/org.spearce.jgit.pgm/src/META-INF/services/org.spearce.jgit.pgm.TextBuiltin
+++ b/org.spearce.jgit.pgm/src/META-INF/services/org.spearce.jgit.pgm.TextBuiltin
@@ -16,6 +16,7 @@ org.spearce.jgit.pgm.RevList
 org.spearce.jgit.pgm.RevParse
 org.spearce.jgit.pgm.Rm
 org.spearce.jgit.pgm.ShowRev
+org.spearce.jgit.pgm.ShowRef
 org.spearce.jgit.pgm.Tag
 org.spearce.jgit.pgm.UploadPack
 org.spearce.jgit.pgm.Version
-- 
1.6.2.1

Re: [PATCH EGIT 1/2] Implement "jgit rev-parse"

[Shawn O. Pearce]

"Daniel Cheng (aka SDiZ)" <j16sdiz+freenet@gmail.com> wrote:
>  .../src/org/spearce/jgit/pgm/RevParse.java         |   70 ++++++++++++++++++++

Thanks.  I have two remarks, I'm amending them in as they are
trivial for me to fix.

> +class RevParse extends TextBuiltin {
> +	RevWalk walk;

Unused field.  Deleted.

> +	@Option(name = "--all")
> +	boolean all = false;
> +
> +	@Argument(index = 0, metaVar = "commit-ish")
> +	private final List<ObjectId> commits = new ArrayList<ObjectId>();
> +
> +	@Override
> +	protected void run() throws Exception {
> +		if (all) {
> +			Map<String, Ref> allRefs = db.getAllRefs();
> +			for (final Ref r : allRefs.values())
> +				System.out.println(r.getObjectId().name());
> +		} else {
> +			for (final ObjectId o : commits)
> +				System.out.println(o.name());

These should use the PrintWriter called "out" inherited from
the TextBuiltin class, not System.out.  Fixed.

-- 
Shawn.