#173: use force update mode for ide-urls

cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java

@@ -42,6 +42,8 @@
  */
 public abstract class AbstractIdeContext implements IdeContext {
 
+  private static final String IDE_URLS_GIT = "https://github.com/devonfw/ide-urls.git";
+
   private final Map<IdeLogLevel, IdeSubLogger> loggers;
 
   private final Path ideHome;
@@ -178,7 +180,6 @@ public AbstractIdeContext(IdeLogLevel minLogLevel, Function<IdeLogLevel, IdeSubL
         if (Files.isDirectory(rootPath)) {
           if (!ideRootPath.equals(rootPath)) {
             warning("Variable IDE_ROOT is set to '{}' but for your project '{}' would have been expected.");
-            ideRootPath = rootPath;
           }
           ideRootPath = this.ideHome.getParent();
         } else {
@@ -257,10 +258,7 @@ public String getMessageIdeHome() {
    */
   public boolean isTest() {
 
-    if (isMock()) {
-      return true;
-    }
-    return false;
+    return isMock();
   }
 
   /**
@@ -487,7 +485,7 @@ public UrlMetadata getUrls() {
 
     if (this.urlMetadata == null) {
       if (!isTest()) {
-        gitPullOrClone(this.urlsPath, "https://github.com/devonfw/ide-urls.git");
+        gitPullOrClone(this.urlsPath, IDE_URLS_GIT, true);
       }
       this.urlMetadata = new UrlMetadata(this);
     }
@@ -557,7 +555,7 @@ public boolean isOnline() {
     try {
       int timeout = 1000;
       online = InetAddress.getByName("github.com").isReachable(timeout);
-    } catch (Exception e) {
+    } catch (Exception ignored) {
 
     }
     return online;
@@ -589,12 +587,11 @@ public DirectoryMerger getWorkspaceMerger() {
   @Override
   public ProcessContext newProcess() {
 
-    ProcessContext processContext = new ProcessContextImpl(this);
-    return processContext;
+    return new ProcessContextImpl(this);
   }
 
   @Override
-  public void gitPullOrClone(Path target, String gitRepoUrl) {
+  public void gitPullOrClone(Path target, String gitRepoUrl, boolean force) {
 
     Objects.requireNonNull(target);
     Objects.requireNonNull(gitRepoUrl);
@@ -611,7 +608,19 @@ public void gitPullOrClone(Path target, String gitRepoUrl) {
         askToContinue(message);
       } else {
         pc.errorHandling(ProcessErrorHandling.WARNING);
-        result = pc.addArg("pull").run(false);
+        if (isOnline()) {
+          result = pc.addArg("fetch").addArg("origin").addArg("master").run(false);
+          if (!result.isSuccessful()) {
+            warning("Git failed to fetch from origin master");
+          }
+        }
+        if (force) {
+          result = pc.addArg("reset").addArg("--hard").addArg("HEAD~").run(false);
+          if (!result.isSuccessful()) {
+            warning("Git failed to reset to head");
+          }
+          result = pc.addArg("clean").addArg("-df").run(false);
+        }
         if (!result.isSuccessful()) {
           String message = "Failed to update git repository at " + target;
           if (this.offlineMode) {
@@ -641,7 +650,6 @@ public void gitPullOrClone(Path target, String gitRepoUrl) {
       pc.addArg("clone");
       if (isQuietMode()) {
         pc.addArg("-q");
-      } else {
       }
       pc.addArgs("--recursive", gitRepoUrl, "--config", "core.autocrlf=false", ".");
       pc.run();

cli/src/main/java/com/devonfw/tools/ide/context/IdeContext.java

@@ -369,8 +369,9 @@ default void requireOnline(String purpose) {
    *        that will contain the ".git" subfolder.
    * @param gitRepoUrl the git remote URL to clone from. May be suffixed with a hash-sign ('#') followed by the branch
    *        name to check-out.
+   * @param force boolean true enforces a git hard reset and cleanup of added files
    */
-  void gitPullOrClone(Path target, String gitRepoUrl);
+  void gitPullOrClone(Path target, String gitRepoUrl, boolean force);
 
   /**
    * @return a new {@link ProcessContext} to {@link ProcessContext#run() run} external commands.