Add tool for importing webrev patches

Reviewed-by: ehelin

Author: JornVernee

args/src/main/java/org/openjdk/skara/args/Command.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.skara.args;
+
+public class Command implements Main {
+    private final String name;
+    private final String helpText;
+    private final Main main;
+
+    Command(String name, String helpText, Main main) {
+        this.name = name;
+        this.helpText = helpText;
+        this.main = main;
+    }
+
+    public String name() {
+        return name;
+    }
+
+    public String helpText() {
+        return helpText;
+    }
+
+    public Main main() {
+        return main;
+    }
+
+    public static CommandHelpText name(String name) {
+        return new CommandHelpText<>(Command::new, name);
+    }
+
+    @Override
+    public void main(String[] args) throws Exception {
+        main.main(args);
+    }
+}

args/src/main/java/org/openjdk/skara/args/CommandCtor.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.skara.args;
+
+public interface CommandCtor<T extends Command> {
+    T construct(String name, String helpText, Main main);
+}

args/src/main/java/org/openjdk/skara/args/CommandHelpText.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.skara.args;
+
+public class CommandHelpText<T extends Command> {
+    private final CommandCtor<T> ctor;
+    private final String name;
+
+    CommandHelpText(CommandCtor<T> ctor, String name) {
+        this.ctor = ctor;
+        this.name = name;
+    }
+
+    public CommandMain<T> helptext(String helpText) {
+        return new CommandMain<>(ctor, name, helpText);
+    }
+}

args/src/main/java/org/openjdk/skara/args/CommandMain.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.skara.args;
+
+public class CommandMain<T extends Command> {
+    private final CommandCtor<T> ctor;
+    private final String name;
+    private final String helpText;
+
+    CommandMain(CommandCtor<T> ctor, String name, String helpText) {
+        this.ctor = ctor;
+        this.name = name;
+        this.helpText = helpText;
+    }
+
+    public T main(Main main) {
+        return ctor.construct(name, helpText, main);
+    }
+}

args/src/main/java/org/openjdk/skara/args/Default.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.skara.args;
+
+public class Default extends Command {
+    Default(String name, String helpText, Main main) {
+        super(name, helpText, main);
+    }
+
+    public static CommandHelpText<Default> name(String name) {
+        return new CommandHelpText<>(Default::new, name);
+    }
+}

args/src/main/java/org/openjdk/skara/args/Executable.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.skara.args;
+
+@FunctionalInterface
+public interface Executable {
+    void execute() throws Exception;
+}

args/src/main/java/org/openjdk/skara/args/Main.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.skara.args;
+
+@FunctionalInterface
+public interface Main {
+    void main(String[] args) throws Exception;
+}

args/src/main/java/org/openjdk/skara/args/MultiCommandParser.java

@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.skara.args;
+
+import java.io.PrintStream;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+public class MultiCommandParser {
+    private final String programName;
+    private final String defaultCommand;
+    private final Map<String, Command> subCommands;
+
+    public MultiCommandParser(String programName, List<Command> commands) {
+        var defaults = commands.stream().filter(Default.class::isInstance).collect(Collectors.toList());
+        if (defaults.size() != 1) {
+            throw new IllegalArgumentException("Expecting exactly one default command");
+        }
+        this.defaultCommand = defaults.get(0).name();
+
+        this.programName = programName;
+        this.subCommands = commands.stream()
+                                   .collect(Collectors.toMap(
+                                           Command::name,
+                                           Function.identity()));
+        this.subCommands.put("help", helpCommand());
+    }
+
+    private Command helpCommand() {
+        return new Command("help", "print a help message", args -> showUsage());
+    }
+
+    public Executable parse(String[] args) {
+        if (args.length > 0) {
+            var p = subCommands.get(args[0]);
+            if (p != null) {
+                var forwardedArgs = Arrays.copyOfRange(args, 1, args.length);
+                return () -> p.main(forwardedArgs);
+            }
+        }
+        return () -> subCommands.get(defaultCommand).main(args);
+    }
+
+    private void showUsage() {
+        showUsage(System.out);
+    }
+
+    private void showUsage(PrintStream ps) {
+        ps.print("usage: ");
+        ps.print(programName);
+        ps.print(subCommands.keySet().stream().collect(Collectors.joining("|", " <", ">")));
+        ps.println(" <input>");
+
+        int spacing = subCommands.keySet().stream().mapToInt(String::length).max().orElse(0);
+        spacing += 8; // some room
+
+        for (var subCommand : subCommands.values()) {
+            ps.println(String.format("  %-" + spacing + "s%s", subCommand.name(), subCommand.helpText()));
+        }
+    }
+}

cli/src/main/java/org/openjdk/skara/cli/GitSkara.java

@@ -22,6 +22,7 @@
  */
 package org.openjdk.skara.cli;
 
+import org.openjdk.skara.args.Main;
 import org.openjdk.skara.vcs.Repository;
 
 import java.io.IOException;
@@ -32,15 +33,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.function.Consumer;
 
 public class GitSkara {
-    @FunctionalInterface
-    private interface Command {
-        void execute(String[] args) throws Exception;
-    }
 
-    private static final Map<String, Command> commands = new TreeMap<>();
+    private static final Map<String, Main> commands = new TreeMap<>();
 
     private static void usage(String[] args) {
         var names = new ArrayList<String>();
@@ -127,7 +123,7 @@ public static void main(String[] args) throws Exception {
         var command = isEmpty ? "help" : args[0];
         var commandArgs = isEmpty ? new String[0] : Arrays.copyOfRange(args, 1, args.length);
         if (commands.containsKey(command)) {
-            commands.get(command).execute(commandArgs);
+            commands.get(command).main(commandArgs);
         } else {
             System.err.println("error: unknown command: " + command);
             usage(args);