#757: Settings in code repository

cli/src/main/java/com/devonfw/tools/ide/commandlet/AbstractUpdateCommandlet.java

@@ -1,5 +1,6 @@
 package com.devonfw.tools.ide.commandlet;
 
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashSet;
@@ -115,6 +116,9 @@ private void updateSettings() {
       // here we do not use pullOrClone to prevent asking a pointless question for repository URL...
       if (Files.isDirectory(settingsPath) && !this.context.getFileAccess().isEmptyDir(settingsPath)) {
         step = this.context.newStep("Pull settings repository");
+        if (!Files.isDirectory(settingsPath.resolve(GitContext.GIT_FOLDER))) {
+          settingsPath = settingsPath.toRealPath();
+        }
         gitContext.pull(settingsPath);
       } else {
         step = this.context.newStep("Clone settings repository");
@@ -132,7 +136,10 @@ private void updateSettings() {
         }
         gitContext.pullOrClone(GitUrl.of(repository), settingsPath);
       }
+      gitContext.saveCurrentCommitId(settingsPath);
       step.success("Successfully updated settings repository.");
+    } catch (IOException e) {
+      throw new IllegalStateException("Could not update the settings repository.");
     } finally {
       if (step != null) {
         step.close();

cli/src/main/java/com/devonfw/tools/ide/commandlet/CreateCommandlet.java

@@ -1,9 +1,14 @@
 package com.devonfw.tools.ide.commandlet;
 
+import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
 
 import com.devonfw.tools.ide.context.IdeContext;
+import com.devonfw.tools.ide.git.GitUrl;
 import com.devonfw.tools.ide.io.FileAccess;
+import com.devonfw.tools.ide.property.BooleanProperty;
 import com.devonfw.tools.ide.property.FlagProperty;
 import com.devonfw.tools.ide.property.StringProperty;
 
@@ -18,6 +23,10 @@ public class CreateCommandlet extends AbstractUpdateCommandlet {
   /** {@link FlagProperty} for skipping the setup of git repositories */
   public final FlagProperty skipRepositories;
 
+  public final FlagProperty codeRepositoryFlag;
+
+  public final StringProperty codeRepository;
+
   /**
    * The constructor.
    *
@@ -28,6 +37,8 @@ public CreateCommandlet(IdeContext context) {
     super(context);
     this.newProject = add(new StringProperty("", true, "project"));
     this.skipRepositories = add(new FlagProperty("--skip-repositories"));
+    this.codeRepositoryFlag = add(new FlagProperty("--code"));
+    this.codeRepository = add(new StringProperty("", false, ""));
     add(this.settingsRepo);
   }
 
@@ -58,13 +69,40 @@ public void run() {
 
     initializeProject(newProjectPath);
     this.context.setIdeHome(newProjectPath);
+    if (codeRepositoryFlag.isTrue()) {
+      String repoUrl = codeRepository.getValue();
+      if (repoUrl.isEmpty()) {
+        this.context.info("Please provide a repository URL after using --code");
+      } else {
+        initializeCodeRepository(repoUrl);
+      }
+    }
     super.run();
+
     if (this.skipRepositories.isTrue()) {
       this.context.info("Skipping the cloning of project repositories as specified by the user.");
     } else {
       updateRepositories();
     }
     this.context.success("Successfully created new project '{}'.", newProjectName);
+
+  }
+
+  private void initializeCodeRepository(String repoUrl) {
+
+    // clone the given repository into IDE_HOME/workspaces/main
+    GitUrl gitUrl = GitUrl.of(repoUrl);
+    Path codeRepoPath = this.context.getWorkspacePath().resolve(gitUrl.getProjectName());
+    this.context.getGitContext().pullOrClone(gitUrl, codeRepoPath);
+
+    // check for settings folder and create symlink to IDE_HOME/settings
+    Path settingsFolder = codeRepoPath.resolve(IdeContext.FOLDER_SETTINGS);
+    if (Files.exists(settingsFolder)) {
+      this.context.getFileAccess().symlink(settingsFolder, this.context.getSettingsPath());
+    }
+
+    // create a file in IDE_HOME with the current local commit id
+    this.context.getGitContext().saveCurrentCommitId(codeRepoPath);
   }
 
   private void initializeProject(Path newInstancePath) {

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

@@ -859,7 +859,7 @@ private ValidationResult applyAndRun(CliArguments arguments, Commandlet cmd) {
           if (this.settingsPath != null) {
             if (getGitContext().isRepositoryUpdateAvailable(this.settingsPath) ||
                 (getGitContext().fetchIfNeeded(this.settingsPath) && getGitContext().isRepositoryUpdateAvailable(this.settingsPath))) {
-              interaction("Updates are available for the settings repository. If you want to pull the latest changes, call ide update.");
+              interaction("Updates are available for the settings repository. If you want to apply the latest changes, call \"ide update\"");
             }
           }
         }

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

@@ -135,6 +135,7 @@ public interface IdeContext extends IdeStartContext {
 
   /** Legacy folder name used as compatibility fallback if {@link #FOLDER_TEMPLATES} does not exist. */
   String FOLDER_LEGACY_TEMPLATES = "devon";
+  String SETTINGS_COMMIT_ID = ".commit.id";
 
   /**
    * @return {@code true} if {@link #isOfflineMode() offline mode} is active or we are NOT {@link #isOnline() online}, {@code false} otherwise.

cli/src/main/java/com/devonfw/tools/ide/git/GitContext.java

@@ -65,6 +65,8 @@ public interface GitContext {
    */
   boolean isRepositoryUpdateAvailable(Path repository);
 
+  void saveCurrentCommitId(Path repository);
+
   /**
    * Attempts a git pull and reset if required.
    *

cli/src/main/java/com/devonfw/tools/ide/git/GitContextImpl.java

@@ -1,5 +1,6 @@
 package com.devonfw.tools.ide.git;
 
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -51,12 +52,40 @@ public boolean fetchIfNeeded(Path repository, String remote, String branch) {
   public boolean isRepositoryUpdateAvailable(Path repository) {
 
     verifyGitInstalled();
-    String localCommitId = runGitCommandAndGetSingleOutput("Failed to get the local commit id.", repository, "rev-parse", "HEAD");
+    Path commitIdFile = this.context.getIdeHome().resolve(IdeContext.SETTINGS_COMMIT_ID);
+    String trackedCommitId = null;
+    if (Files.exists(commitIdFile)) {
+      try {
+        trackedCommitId = Files.readString(commitIdFile);
+      } catch (IOException e) {
+        return false;
+      }
+    }
+
     String remoteCommitId = runGitCommandAndGetSingleOutput("Failed to get the remote commit id.", repository, "rev-parse", "@{u}");
-    if ((localCommitId == null) || (remoteCommitId == null)) {
+    if ((trackedCommitId == null) || (remoteCommitId == null)) {
       return false;
     }
-    return !localCommitId.equals(remoteCommitId);
+    return !trackedCommitId.equals(remoteCommitId);
+  }
+
+  @Override
+  public void saveCurrentCommitId(Path repository) {
+
+    if (!Files.exists(repository.resolve(GitContext.GIT_FOLDER))) {
+      try {
+        repository = repository.toRealPath();
+      } catch (IOException e) {
+        throw new IllegalStateException("Couldn't resolve settings to real path.", e);
+      }
+    }
+    String currentCommitId = runGitCommandAndGetSingleOutput("Failed to get current commit id.", repository, "rev-parse", "HEAD");
+    Path commitIdFile = this.context.getIdeHome().resolve(IdeContext.SETTINGS_COMMIT_ID);
+    try {
+      Files.writeString(commitIdFile, currentCommitId);
+    } catch (IOException e) {
+      throw new RuntimeException("Failed to save commit ID", e);
+    }
   }
 
   @Override

cli/src/main/java/com/devonfw/tools/ide/git/GitUrl.java

@@ -43,6 +43,21 @@ public String toString() {
     return this.url + "#" + this.branch;
   }
 
+  /**
+   * Extracts the project name from an git URL.
+   * For URLs like "https://github.com/devonfw/ide-urls.git" returns "ide-urls"
+   *
+   * @return the project name without ".git" extension
+   */
+  public String getProjectName() {
+    String path = this.url.substring(this.url.indexOf("://") + 3);
+    if (path.endsWith(".git")) {
+      path = path.substring(0, path.length() - 4);
+    }
+    String[] parts = path.split("/");
+    return parts[parts.length - 1];
+  }
+
   /**
    * @param gitUrl the {@link #toString() string representation} of a {@link GitUrl}. May contain a branch name as {@code «url»#«branch»}.
    * @return the parsed {@link GitUrl}.