git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Shawn O. Pearce" <spearce@spearce.org>
To: Robin Rosenberg <robin.rosenberg@dewire.com>,
	Marek Zawirski <marek.zawirski@gmail.com>
Cc: git@vger.kernel.org
Subject: [JGIT PATCH 07/28] Define our own extended CmdLineParser for extra parsing support
Date: Thu, 17 Jul 2008 21:44:00 -0400	[thread overview]
Message-ID: <1216345461-59382-8-git-send-email-spearce@spearce.org> (raw)
In-Reply-To: <1216345461-59382-7-git-send-email-spearce@spearce.org>

A specialized CmdLineParser subclass is used to automatically handle
`--git-dir=foo`, as args4j wants to see `--git-dir foo` instead.
We split on the first equal sign on a long option and use that to
delimit the value from the option name.

We stop this long option fixup at the first -- found on the command
line, as this is a traditional delimiter between options and only
arguments.  This is an assumption that all of our users of a command
line parser support would want to terminate option parsing at the
first -- they see on the command line, and thus it is OK to stop
our GNU long optino style cleanup.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 .../org/spearce/jgit/pgm/opt/CmdLineParser.java    |  157 ++++++++++++++++++++
 1 files changed, 157 insertions(+), 0 deletions(-)
 create mode 100644 org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/CmdLineParser.java

diff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/CmdLineParser.java b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/CmdLineParser.java
new file mode 100644
index 0000000..257d88f
--- /dev/null
+++ b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/opt/CmdLineParser.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org>
+ *
+ * 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.opt;
+
+import java.util.ArrayList;
+
+import org.kohsuke.args4j.Argument;
+import org.kohsuke.args4j.CmdLineException;
+import org.kohsuke.args4j.IllegalAnnotationError;
+import org.kohsuke.args4j.Option;
+import org.spearce.jgit.lib.Repository;
+import org.spearce.jgit.pgm.TextBuiltin;
+import org.spearce.jgit.revwalk.RevWalk;
+
+/**
+ * Extended command line parser which handles --foo=value arguments.
+ * <p>
+ * The args4j package does not natively handle --foo=value and instead prefers
+ * to see --foo value on the command line. Many users are used to the GNU style
+ * --foo=value long option, so we convert from the GNU style format to the
+ * args4j style format prior to invoking args4j for parsing.
+ */
+public class CmdLineParser extends org.kohsuke.args4j.CmdLineParser {
+	private final Repository db;
+
+	private RevWalk walk;
+
+	/**
+	 * Creates a new command line owner that parses arguments/options and set
+	 * them into the given object.
+	 * 
+	 * @param bean
+	 *            instance of a class annotated by {@link Option} and
+	 *            {@link Argument}. this object will receive values.
+	 * 
+	 * @throws IllegalAnnotationError
+	 *             if the option bean class is using args4j annotations
+	 *             incorrectly.
+	 */
+	public CmdLineParser(final Object bean) {
+		this(bean, null);
+	}
+
+	/**
+	 * Creates a new command line owner that parses arguments/options and set
+	 * them into the given object.
+	 * 
+	 * @param bean
+	 *            instance of a class annotated by {@link Option} and
+	 *            {@link Argument}. this object will receive values.
+	 * @param repo
+	 *            repository this parser can translate options through.
+	 * @throws IllegalAnnotationError
+	 *             if the option bean class is using args4j annotations
+	 *             incorrectly.
+	 */
+	public CmdLineParser(final Object bean, Repository repo) {
+		super(bean);
+		if (repo == null && bean instanceof TextBuiltin)
+			repo = ((TextBuiltin) bean).getRepository();
+		this.db = repo;
+	}
+
+	@Override
+	public void parseArgument(final String... args) throws CmdLineException {
+		final ArrayList<String> tmp = new ArrayList<String>(args.length);
+		for (int argi = 0; argi < args.length; argi++) {
+			final String str = args[argi];
+			if (str.equals("--")) {
+				while (argi < args.length)
+					tmp.add(args[argi++]);
+				break;
+			}
+
+			if (str.startsWith("--")) {
+				final int eq = str.indexOf('=');
+				if (eq > 0) {
+					tmp.add(str.substring(0, eq));
+					tmp.add(str.substring(eq + 1));
+					continue;
+				}
+			}
+
+			tmp.add(str);
+		}
+
+		super.parseArgument(tmp.toArray(new String[tmp.size()]));
+	}
+
+	/**
+	 * Get the repository this parser translates values through.
+	 * 
+	 * @return the repository, if specified during construction.
+	 */
+	public Repository getRepository() {
+		if (db == null)
+			throw new IllegalStateException("No Git repository configured.");
+		return db;
+	}
+
+	/**
+	 * Get the revision walker used to support option parsing.
+	 * 
+	 * @return the revision walk used by this option parser.
+	 */
+	public RevWalk getRevWalk() {
+		if (walk == null)
+			walk = new RevWalk(getRepository());
+		return walk;
+	}
+
+	/**
+	 * Get the revision walker used to support option parsing.
+	 * <p>
+	 * This method does not initialize the RevWalk and may return null.
+	 * 
+	 * @return the revision walk used by this option parser, or null.
+	 */
+	public RevWalk getRevWalkGently() {
+		return walk;
+	}
+}
-- 
1.5.6.3.569.ga9185

  reply	other threads:[~2008-07-18  1:46 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-18  1:43 [JGIT PATCH 00/28] Convert command line parsing to args4j Shawn O. Pearce
2008-07-18  1:43 ` [JGIT PATCH 01/28] Fix deadlock caused by push over SSH Shawn O. Pearce
2008-07-18  1:43   ` [JGIT PATCH 02/28] Use die utility method in glog Shawn O. Pearce
2008-07-18  1:43     ` [JGIT PATCH 03/28] Add args4j library for command line switch processing Shawn O. Pearce
2008-07-18  1:43       ` [JGIT PATCH 04/28] Move org.spearce.jgit.pgm to its own Java project Shawn O. Pearce
2008-07-18  1:43         ` [JGIT PATCH 05/28] Make TextBuiltin public so other packages can implement and use it Shawn O. Pearce
2008-07-18  1:43           ` [JGIT PATCH 06/28] Initialize TextBuiltins with the repository before execution Shawn O. Pearce
2008-07-18  1:44             ` Shawn O. Pearce [this message]
2008-07-18  1:44               ` [JGIT PATCH 08/28] Add parseTree method to RevWalk to obtain a RevTree from AnyObjectId Shawn O. Pearce
2008-07-18  1:44                 ` [JGIT PATCH 09/28] Add option handler for AbstractTreeIterator values Shawn O. Pearce
2008-07-18  1:44                   ` [JGIT PATCH 10/28] Add option handler for ObjectId values Shawn O. Pearce
2008-07-18  1:44                     ` [JGIT PATCH 11/28] Add option handler for PathTreeFilter values Shawn O. Pearce
2008-07-18  1:44                       ` [JGIT PATCH 12/28] Add option handler for RefSpec values Shawn O. Pearce
2008-07-18  1:44                         ` [JGIT PATCH 13/28] Add option handler for RevCommit values Shawn O. Pearce
2008-07-18  1:44                           ` [JGIT PATCH 14/28] Add option handler for RevTree values Shawn O. Pearce
2008-07-18  1:44                             ` [JGIT PATCH 15/28] Register most of our OptionHandler implementations for automatic use Shawn O. Pearce
2008-07-18  1:44                               ` [JGIT PATCH 16/28] Convert jgit's Main to use args4j for basic parsing services Shawn O. Pearce
2008-07-18  1:44                                 ` [JGIT PATCH 17/28] Support automatic command line parsing for TextBuiltin subclasses Shawn O. Pearce
2008-07-18  1:44                                   ` [JGIT PATCH 18/28] Convert diff-tree program to args4j Shawn O. Pearce
2008-07-18  1:44                                     ` [JGIT PATCH 19/28] Convert fetch " Shawn O. Pearce
2008-07-18  1:44                                       ` [JGIT PATCH 20/28] Convert index-pack " Shawn O. Pearce
2008-07-18  1:44                                         ` [JGIT PATCH 21/28] Convert ls-remote " Shawn O. Pearce
2008-07-18  1:44                                           ` [JGIT PATCH 22/28] Convert ls-tree " Shawn O. Pearce
2008-07-18  1:44                                             ` [JGIT PATCH 23/28] Convert merge-base " Shawn O. Pearce
2008-07-18  1:44                                               ` [JGIT PATCH 24/28] Convert push " Shawn O. Pearce
2008-07-18  1:44                                                 ` [JGIT PATCH 25/28] Convert show-ref " Shawn O. Pearce
2008-07-18  1:44                                                   ` [JGIT PATCH 26/28] Convert tag " Shawn O. Pearce
2008-07-18  1:44                                                     ` [JGIT PATCH 27/28] Convert rev-list, log, glog programs " Shawn O. Pearce
2008-07-18  1:44                                                       ` [JGIT PATCH 28/28] Remove support for legacy style TextBuiltins Shawn O. Pearce

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1216345461-59382-8-git-send-email-spearce@spearce.org \
    --to=spearce@spearce.org \
    --cc=git@vger.kernel.org \
    --cc=marek.zawirski@gmail.com \
    --cc=robin.rosenberg@dewire.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).