feat: Re-enable rebase current origin

This function was disabled after the migration of VertX to Virtual
Threads due to different implementation.

src/main/java/org/nqm/command/GitCommand.java

@@ -2,8 +2,11 @@
 
 import static org.nqm.command.CommandVerticle.GIS_CONCAT_MODULES_NAME_OPT;
 import static org.nqm.command.CommandVerticle.GIS_NO_PRINT_MODULES_NAME_OPT;
+import static org.nqm.command.Wrapper.ORIGIN;
 import static org.nqm.command.Wrapper.forEachModuleDo;
+import static org.nqm.command.Wrapper.forEachModuleDoRebaseCurrent;
 import static org.nqm.command.Wrapper.forEachModuleWith;
+import static org.nqm.command.Wrapper.getCurrentBranchUnderPath;
 import static org.nqm.config.GisConfig.currentDir;
 import java.io.BufferedReader;
 import java.io.FileOutputStream;
@@ -22,13 +25,10 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
-import org.nqm.GisException;
 import org.nqm.config.GisConfig;
-import org.nqm.config.GisLog;
-import org.nqm.utils.GisProcessUtils;
+import org.nqm.model.GisSort;
 import org.nqm.utils.GisStringUtils;
 import org.nqm.utils.StdOutUtils;
-import org.nqm.model.GisSort;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.Parameters;
@@ -37,7 +37,6 @@ public class GitCommand {
 
   private static final String CHECKOUT = "checkout";
   private static final String FETCHED_AT = "(fetched at: %s)";
-  private static final String ORIGIN = "origin";
   private static final Path TMP_FILE = Path.of("/", "tmp", "gis_fetch" + currentDir().replace("/", "_"));
 
   static final String GIS_AUTOCOMPLETE_FILE = "_gis";
@@ -130,8 +129,8 @@ void fetchStatus(@Option(names = "--sort",
 
   @Command(name = "rebase-current-origin", aliases = "ru",
       description = "Reapply commits on top of current repositories' origin")
-  void rebaseCurrentOrigin() {
-    throw new GisException("this function is in progress");
+  void rebaseCurrentOrigin() throws IOException {
+    forEachModuleDoRebaseCurrent();
   }
 
   @Command(name = "rebase-origin", aliases = "re", description = "Reapply commits on top of other base tip")
@@ -298,21 +297,11 @@ private static Stream<String> streamOf(String[] input) {
     return Stream.of(input).map(String::trim).distinct();
   }
 
-  private String getCurrentBranchUnderPath(Path path) throws IOException {
-    var result = GisProcessUtils.quickRun(path.toFile(), GisConfig.GIT_HOME_DIR, "branch", "--show-current");
-    return result.output().trim();
-  }
-
   private boolean isSameBranchUnderPath(String branch, Path path) {
     if (GisStringUtils.isBlank(branch)) {
       return false;
     }
-    try {
-      return branch.equals(getCurrentBranchUnderPath(path));
-    } catch (IOException e) {
-      GisLog.debug(e);
-      throw new GisException(e.getMessage());
-    }
+    return branch.equals(getCurrentBranchUnderPath(path));
   }
 
   private boolean isConfirmed(String question) throws IOException {

src/main/java/org/nqm/command/Wrapper.java

@@ -11,16 +11,21 @@
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
+import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 import org.nqm.GisException;
+import org.nqm.config.GisConfig;
 import org.nqm.config.GisLog;
+import org.nqm.utils.GisProcessUtils;
 import org.nqm.utils.StdOutUtils;
 
 public final class Wrapper {
 
   private Wrapper() {}
 
+  public static final String ORIGIN = "origin";
+
   private static File isFileExist(File f) {
     return f.exists() ? f : null;
   }
@@ -44,15 +49,18 @@ private static File getFileMarker() {
     return gitModulesFilePath;
   }
 
-  public static Queue<String> forEachModuleWith(Predicate<Path> pred, String... args)
-      throws IOException {
+  public static Queue<String> forEachModuleDo(String... args) throws IOException {
+    return forEachModuleWith(p -> true, args);
+  }
+
+  public static Queue<String> forEachModuleWith(Predicate<Path> pred, String... args) throws IOException {
     var gitModulesFilePath = getFileMarker();
     var currentDir = currentDir();
     var output = new ConcurrentLinkedQueue<String>();
     try (var exe = Executors.newVirtualThreadPerTaskExecutor()) {
-      Optional.of(Path.of(currentDir))
-          .filter(pred)
-          .ifPresent(root -> exe.submit(() -> output.add(CommandVerticle.execute(root, args))));
+      Consumer<Path> consume = path -> exe.submit(() -> output.add(CommandVerticle.execute(path, args)));
+      Optional.of(Path.of(currentDir)).filter(pred).ifPresent(consume);
+
       Files.readAllLines(gitModulesFilePath.toPath()).stream()
           .map(String::trim)
           .filter(s -> s.startsWith("path"))
@@ -66,12 +74,47 @@ public static Queue<String> forEachModuleWith(Predicate<Path> pred, String... ar
             return false;
           })
           .filter(pred)
-          .forEach(dir -> exe.submit(() -> output.add(CommandVerticle.execute(dir, args))));
+          .forEach(consume);
     }
     return output;
   }
 
-  public static Queue<String> forEachModuleDo(String... args) throws IOException {
-    return forEachModuleWith(p -> true, args);
+  public static void forEachModuleDoRebaseCurrent() throws IOException {
+    var gitModulesFilePath = getFileMarker();
+    var currentDir = currentDir();
+
+    try (var exe = Executors.newVirtualThreadPerTaskExecutor()) {
+      Consumer<Path> consume = path -> exe.submit(() -> {
+        var args = new String[] {"rebase", "%s/%s".formatted(ORIGIN, getCurrentBranchUnderPath(path))};
+        CommandVerticle.execute(path, args);
+      });
+
+      consume.accept(Path.of(currentDir));
+
+      Files.readAllLines(gitModulesFilePath.toPath()).stream()
+          .map(String::trim)
+          .filter(s -> s.startsWith("path"))
+          .map(s -> s.replace("path = ", ""))
+          .map(dir -> Path.of(currentDir, dir))
+          .filter(dir -> {
+            if (dir.toFile().exists()) {
+              return true;
+            }
+            StdOutUtils.errln("directory '%s' does not exist, will be ignored!".formatted("" + dir));
+            return false;
+          })
+          .forEach(consume);
+    }
+  }
+
+  public static String getCurrentBranchUnderPath(Path path) {
+    try {
+      return GisProcessUtils.quickRun(path.toFile(), GisConfig.GIT_HOME_DIR, "branch", "--show-current")
+          .output()
+          .trim();
+    } catch (IOException e) {
+      GisLog.debug(e);
+      throw new GisException("Could not get branch name of module: " + path);
+    }
   }
 }