fixup! Cache Git commands related to submodules

* Cache commands with sha input and no variable input like Git Notes Only fetch Git Notes for commands that are not cached * Cache GetCommitRangeDiffCount (for rev-diff) * Increase Git command cache to 50
gitextensions · Feb 22, 2021 · 8cafaa3 · 8cafaa3
1 parent e0dfb54
commit 8cafaa3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/GitCommands/CommitDataManager.cs b/GitCommands/CommitDataManager.cs
@@ -204,7 +204,7 @@ private bool TryGetCommitLog(string commitId, string format, [NotNullWhen(return
             };
 
             // This command can be cached if commitId is a git sha and Notes are ignored
-            Debug.Assert(!cache || ObjectId.TryParse(commitId, out _), $"Cache should be used only for sha");
+            Debug.Assert(!cache || ObjectId.TryParse(commitId, out _), $"git-log cache should be used only for sha ({commitId})");
 
             data = GetModule().GitExecutable.GetOutput(arguments,
                 outputEncoding: GitModule.LosslessEncoding,

diff --git a/GitUI/Editor/FileViewer.cs b/GitUI/Editor/FileViewer.cs
@@ -541,7 +541,7 @@ public Task ViewGitItemAsync(GitItemStatus file, [CanBeNull] Action openWithDiff
                 isSubmodule,
                 getImage: GetImage,
                 getFileText: GetFileTextIfBlobExists,
-                getSubmoduleText: () => LocalizationHelpers.GetSubmoduleText(Module, file.Name.TrimEnd('/'), sha),
+                getSubmoduleText: () => LocalizationHelpers.GetSubmoduleText(Module, file.Name.TrimEnd('/'), sha, cache: true),
                 openWithDifftool: openWithDifftool);
 
             string GetFileTextIfBlobExists()
@@ -599,7 +599,7 @@ public Task ViewFileAsync(string fileName, bool isSubmodule = false, [CanBeNull]
                     isSubmodule,
                     getImage: GetImage,
                     getFileText: GetFileText,
-                    getSubmoduleText: () => LocalizationHelpers.GetSubmoduleText(Module, fileName.TrimEnd('/'), ""),
+                    getSubmoduleText: () => LocalizationHelpers.GetSubmoduleText(Module, fileName.TrimEnd('/'), "", cache: false),
                     openWithDifftool));
 
             Image GetImage()

diff --git a/ResourceManager/LocalizationHelpers.cs b/ResourceManager/LocalizationHelpers.cs
@@ -78,7 +78,7 @@ public static string GetFullDateString(DateTimeOffset datetime)
             return datetime.LocalDateTime.ToString("G");
         }
 
-        public static string GetSubmoduleText(GitModule superproject, string name, string hash)
+        public static string GetSubmoduleText(GitModule superproject, string name, string hash, bool cache)
         {
             var sb = new StringBuilder();
             sb.AppendLine("Submodule " + name);
@@ -91,7 +91,7 @@ public static string GetSubmoduleText(GitModule superproject, string name, strin
                 // TEMP, will be moved in the follow up refactor
                 ICommitDataManager commitDataManager = new CommitDataManager(() => module);
 
-                CommitData data = commitDataManager.GetCommitData(hash, out _, cache: true);
+                CommitData data = commitDataManager.GetCommitData(hash, out _, cache);
                 if (data is null)
                 {
                     sb.AppendLine("Commit hash:\t" + hash);