Fix slide in suggestion on the repo that is not selected at the moment (

closes #1529)

CHANGE-NOTES.md

@@ -4,6 +4,7 @@
 - Improved the repository selection combobox so that modules are now searchable.
 - Added a field to provide/edit a custom annotation in the Slide In dialog.
 - Added Compare With Parent action to the context menu.
+- Fixed an issue with Slide In Unmanaged Branch Notification for a branch from a git repository that is not selected.
 
 ## v3.5.1
 - Improve stability of traverse and slide-out/slide-in actions.

backend/api/src/main/java/com/virtuslab/gitmachete/backend/api/IGitMacheteRepositorySnapshot.java

@@ -1,5 +1,7 @@
 package com.virtuslab.gitmachete.backend.api;
 
+import java.nio.file.Path;
+
 import io.vavr.collection.List;
 import io.vavr.collection.Set;
 import lombok.Data;
@@ -13,6 +15,8 @@
  * Each {@code get...} method is guaranteed to return the same value each time it's called on a given object.
  */
 public interface IGitMacheteRepositorySnapshot {
+  Path getMainGitDirectoryPath();
+
   BranchLayout getBranchLayout();
 
   List<IRootManagedBranchSnapshot> getRootBranches();

backend/api/src/main/java/com/virtuslab/gitmachete/backend/api/NullGitMacheteRepositorySnapshot.java

@@ -1,5 +1,7 @@
 package com.virtuslab.gitmachete.backend.api;
 
+import java.nio.file.Path;
+
 import io.vavr.collection.List;
 import io.vavr.collection.Set;
 import io.vavr.collection.TreeSet;
@@ -18,6 +20,11 @@ public static IGitMacheteRepositorySnapshot getInstance() {
     return instance;
   }
 
+  @Override
+  public Path getMainGitDirectoryPath() {
+    return Path.of("");
+  }
+
   @Override
   public BranchLayout getBranchLayout() {
     return new BranchLayout(List.empty());

backend/impl/src/main/java/com/virtuslab/gitmachete/backend/impl/GitMacheteRepositorySnapshot.java

@@ -1,5 +1,7 @@
 package com.virtuslab.gitmachete.backend.impl;
 
+import java.nio.file.Path;
+
 import io.vavr.collection.LinkedHashMap;
 import io.vavr.collection.List;
 import io.vavr.collection.Set;
@@ -19,6 +21,9 @@
 @RequiredArgsConstructor
 public class GitMacheteRepositorySnapshot implements IGitMacheteRepositorySnapshot {
 
+  @Getter
+  private final Path mainGitDirectoryPath;
+
   @Getter
   private final List<IRootManagedBranchSnapshot> rootBranches;
 

backend/impl/src/main/java/com/virtuslab/gitmachete/backend/impl/aux/CreateGitMacheteRepositoryAux.java

@@ -9,6 +9,7 @@
 import static io.vavr.API.Case;
 import static io.vavr.API.Match;
 
+import java.nio.file.Path;
 import java.time.Instant;
 
 import io.vavr.Tuple;
@@ -57,6 +58,7 @@ public class CreateGitMacheteRepositoryAux extends Aux {
   private final PreRebaseHookExecutor preRebaseHookExecutor;
   private final List<String> remoteNames;
   private final java.util.Set<String> createdBranches = new java.util.HashSet<>();
+  private final Path mainGitDirectoryPath;
 
   public CreateGitMacheteRepositoryAux(
       IGitCoreRepository gitCoreRepository,
@@ -67,6 +69,7 @@ public CreateGitMacheteRepositoryAux(
     this.statusHookExecutor = statusHookExecutor;
     this.preRebaseHookExecutor = preRebaseHookExecutor;
     this.remoteNames = gitCoreRepository.deriveAllRemoteNames();
+    this.mainGitDirectoryPath = gitCoreRepository.getMainGitDirectoryPath();
   }
 
   @UIThreadUnsafe
@@ -105,7 +108,8 @@ public IGitMacheteRepositorySnapshot createSnapshot(BranchLayout branchLayout) t
 
     val operationsBaseBranchName = deriveOngoingOperationsBaseBranchName(ongoingOperationType);
 
-    return new GitMacheteRepositorySnapshot(List.narrow(rootBranches), branchLayout, currentBranchIfManaged,
+    return new GitMacheteRepositorySnapshot(mainGitDirectoryPath, List.narrow(rootBranches), branchLayout,
+        currentBranchIfManaged,
         managedBranchByName, duplicatedBranchNames, skippedBranchNames, preRebaseHookExecutor,
         new IGitMacheteRepositorySnapshot.OngoingRepositoryOperation(ongoingOperationType, operationsBaseBranchName));
   }

frontend/ui/impl/src/main/java/com/virtuslab/gitmachete/frontend/ui/impl/table/DemoGitMacheteRepositorySnapshot.java

@@ -1,5 +1,6 @@
 package com.virtuslab.gitmachete.frontend.ui.impl.table;
 
+import java.nio.file.Path;
 import java.time.Instant;
 
 import io.vavr.NotImplementedError;
@@ -91,6 +92,11 @@ static RelationToRemote getRelationOfSTRS(SyncToRemoteStatus syncToRemoteStatus)
     return RelationToRemote.of(syncToRemoteStatus, "origin");
   }
 
+  @Override
+  public Path getMainGitDirectoryPath() {
+    return Path.of("dummy");
+  }
+
   @Override
   public BranchLayout getBranchLayout() {
     throw new NotImplementedError();

frontend/ui/impl/src/main/java/com/virtuslab/gitmachete/frontend/ui/impl/table/EnhancedGraphTable.java

@@ -294,8 +294,10 @@ private void trackCurrentBranchChange(GitRepository repository) {
         if (unmanagedBranchNotification != null) {
           unmanagedBranchNotification.expire();
         }
-        if (gitMacheteRepositorySnapshot != null) {
-          val entry = gitMacheteRepositorySnapshot.getBranchLayout().getEntryByName(repositoryCurrentBranchName);
+        val snapshot = gitMacheteRepositorySnapshot;
+        val mainGitDirectory = GitVfsUtils.getMainGitDirectory(repository);
+        if (snapshot != null && snapshot.getMainGitDirectoryPath().equals(mainGitDirectory)) {
+          val entry = snapshot.getBranchLayout().getEntryByName(repositoryCurrentBranchName);
           if (entry == null) {
             inferParentForUnmanagedBranchNotificationAndNotify(repositoryCurrentBranchName);
           }