Add Reset to the JGit CLI

Change-Id: I85368c849c0964b9a539fa1991920adb2ace94df
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>

diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
index 9dce168c15271a13bc4c2c9abe081d72e63c5f5f..c1b5c5344389e5077970b5a6a247176e91c4e27f 100644 (file)
--- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
+++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
@@ -191,6 +191,10 @@ usage_pruneStaleTrackingRefs=prune stale tracking refs
 usage_recordChangesToRepository=Record changes to the repository
 usage_recurseIntoSubtrees=recurse into subtrees
 usage_renameLimit=limit size of rename matrix
+usage_reset=Reset current HEAD to the specified state
+usage_resetHard=Resets the index and working tree
+usage_resetSoft=Resets without touching the index file nor the working tree
+usage_resetMixed=Resets the index but not the working tree
 usage_setTheGitRepositoryToOperateOn=set the git repository to operate on
 usage_showPatch=display patch
 usage_showRefNamesMatchingCommits=Show ref names matching commits

diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reset.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reset.java
new file mode 100644 (file)
index 0000000..f4cbcaf
--- /dev/null
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reset.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2011, Chris Aniszczyk <caniszczyk@gmail.com>
+ * and other copyright owners as documented in the project's IP log.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Distribution License v1.0 which
+ * accompanies this distribution, is reproduced below, and is
+ * available at http://www.eclipse.org/org/documents/edl-v10.php
+ *
+ * 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 Eclipse Foundation, Inc. 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.eclipse.jgit.pgm;
+
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.ResetCommand;
+import org.eclipse.jgit.api.ResetCommand.ResetType;
+import org.kohsuke.args4j.Argument;
+import org.kohsuke.args4j.Option;
+
+@Command(common = true, usage = "usage_reset")
+class Reset extends TextBuiltin {
+
+       @Option(name = "--soft", usage = "usage_resetSoft")
+       private boolean soft = false;
+
+       @Option(name = "--mixed", usage = "usage_resetMixed")
+       private boolean mixed = false;
+
+       @Option(name = "--hard", usage = "usage_resetHard")
+       private boolean hard = false;
+
+       @Argument(required = true, metaVar = "metaVar_name", usage = "usage_reset")
+       private String commit;
+
+       @Override
+       protected void run() throws Exception {
+               ResetCommand command = new Git(db).reset();
+               command.setRef(commit);
+               ResetType mode = null;
+               if (soft)
+                       mode = selectMode(mode, ResetType.SOFT);
+               if (mixed)
+                       mode = selectMode(mode, ResetType.MIXED);
+               if (hard)
+                       mode = selectMode(mode, ResetType.HARD);
+               if (mode == null)
+                       throw die("no reset mode set");
+               command.setMode(mode);
+               command.call();
+       }
+
+       private static ResetType selectMode(ResetType mode, ResetType want) {
+               if (mode != null)
+                       throw die("reset modes are mutually exclusive, select one");
+               return want;
+       }
+}