From 0466a66dafe99a019752f0f729735613825e54ba Mon Sep 17 00:00:00 2001 From: Pravin Barton <9560941+isc-pbarton@users.noreply.github.com> Date: Fri, 19 Apr 2024 15:18:35 -0400 Subject: [PATCH 1/2] remove dependance on localstorage, which undoes change to not show added files as staged --- .../share/git-webui/webui/js/git-webui.js | 22 ++----------------- .../src/share/git-webui/webui/js/git-webui.js | 22 ++----------------- 2 files changed, 4 insertions(+), 40 deletions(-) diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js index 15cc7b36..394ba603 100644 --- a/git-webui/release/share/git-webui/webui/js/git-webui.js +++ b/git-webui/release/share/git-webui/webui/js/git-webui.js @@ -2150,7 +2150,6 @@ webui.ChangedFilesView = function(workspaceView, type, label) { var uncommittedItems = JSON.parse(uncommitted)["current user's changes"]; var otherDeveloperUncommittedItems = JSON.parse(uncommitted)["other users' changes"]; self.filesCount = 0; - var filePaths = []; function addItemToFileList(fileList, otherDeveloperUsername, model) { var isForCurrentUser = otherDeveloperUsername === ""? true : false; var cssClass = isForCurrentUser ? 'list-group-item available' : 'list-group-item unavailable'; @@ -2179,15 +2178,10 @@ webui.ChangedFilesView = function(workspaceView, type, label) { } else { model = line; } - filePaths.push(model); - if (workingTreeStatus === "D") { - localStorage.removeItem(model); - } - - var isNotStaged= workingTreeStatus != "D" && workingTreeStatus != " " && localStorage.getItem(model) === null; + var isNotStaged= workingTreeStatus != "D" && workingTreeStatus != " " var addUnstagedFile = col == 1 && isNotStaged; - var addStagedFile = col == 0 && indexStatus != " " && indexStatus != "?" && localStorage.getItem(model) !== null; + var addStagedFile = col == 0 && indexStatus != " " && indexStatus != "?" if (addUnstagedFile || addStagedFile) { ++self.filesCount; var isForCurrentUser; @@ -2217,12 +2211,6 @@ webui.ChangedFilesView = function(workspaceView, type, label) { $('[data-toggle="tooltip"]').tooltip() }); - Object.keys(localStorage).filter(function (key) { - return (filePaths.indexOf(key) === -1); - }).map(function (key) { - localStorage.removeItem(key); - }); - if (selectedIndex !== null && selectedIndex >= fileList.childElementCount) { selectedIndex = fileList.childElementCount - 1; if (selectedIndex == -1) { @@ -2388,12 +2376,6 @@ webui.ChangedFilesView = function(workspaceView, type, label) { var files = self.getFileList(undefined, "D", 0); var rmFiles = self.getFileList("D", undefined, 0); - if (action === "stage") { - localStorage.setItem(files.trim(), "staged"); - } else { - localStorage.removeItem(files.trim()); - } - if (files.length != 0) { var cmd = type == "working-copy" ? "add" : "reset"; webui.git(cmd + " -- " + files, function(data) { diff --git a/git-webui/src/share/git-webui/webui/js/git-webui.js b/git-webui/src/share/git-webui/webui/js/git-webui.js index 15cc7b36..394ba603 100644 --- a/git-webui/src/share/git-webui/webui/js/git-webui.js +++ b/git-webui/src/share/git-webui/webui/js/git-webui.js @@ -2150,7 +2150,6 @@ webui.ChangedFilesView = function(workspaceView, type, label) { var uncommittedItems = JSON.parse(uncommitted)["current user's changes"]; var otherDeveloperUncommittedItems = JSON.parse(uncommitted)["other users' changes"]; self.filesCount = 0; - var filePaths = []; function addItemToFileList(fileList, otherDeveloperUsername, model) { var isForCurrentUser = otherDeveloperUsername === ""? true : false; var cssClass = isForCurrentUser ? 'list-group-item available' : 'list-group-item unavailable'; @@ -2179,15 +2178,10 @@ webui.ChangedFilesView = function(workspaceView, type, label) { } else { model = line; } - filePaths.push(model); - if (workingTreeStatus === "D") { - localStorage.removeItem(model); - } - - var isNotStaged= workingTreeStatus != "D" && workingTreeStatus != " " && localStorage.getItem(model) === null; + var isNotStaged= workingTreeStatus != "D" && workingTreeStatus != " " var addUnstagedFile = col == 1 && isNotStaged; - var addStagedFile = col == 0 && indexStatus != " " && indexStatus != "?" && localStorage.getItem(model) !== null; + var addStagedFile = col == 0 && indexStatus != " " && indexStatus != "?" if (addUnstagedFile || addStagedFile) { ++self.filesCount; var isForCurrentUser; @@ -2217,12 +2211,6 @@ webui.ChangedFilesView = function(workspaceView, type, label) { $('[data-toggle="tooltip"]').tooltip() }); - Object.keys(localStorage).filter(function (key) { - return (filePaths.indexOf(key) === -1); - }).map(function (key) { - localStorage.removeItem(key); - }); - if (selectedIndex !== null && selectedIndex >= fileList.childElementCount) { selectedIndex = fileList.childElementCount - 1; if (selectedIndex == -1) { @@ -2388,12 +2376,6 @@ webui.ChangedFilesView = function(workspaceView, type, label) { var files = self.getFileList(undefined, "D", 0); var rmFiles = self.getFileList("D", undefined, 0); - if (action === "stage") { - localStorage.setItem(files.trim(), "staged"); - } else { - localStorage.removeItem(files.trim()); - } - if (files.length != 0) { var cmd = type == "working-copy" ? "add" : "reset"; webui.git(cmd + " -- " + files, function(data) { From 2409a90705450a5adea0bced219dae790245f670 Mon Sep 17 00:00:00 2001 From: Pravin Barton <9560941+isc-pbarton@users.noreply.github.com> Date: Fri, 19 Apr 2024 15:27:17 -0400 Subject: [PATCH 2/2] git command to add new file no longer stages it --- cls/SourceControl/Git/Utils.cls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls index 777877e8..eba067b9 100644 --- a/cls/SourceControl/Git/Utils.cls +++ b/cls/SourceControl/Git/Utils.cls @@ -526,7 +526,7 @@ ClassMethod AddToSourceControl(InternalName As %String) As %Status set FileType = ##class(SourceControl.Git.Utils).Type(.FileInternalName) set @..#Storage@("items", FileInternalName) = "" - do ..RunGitCommand("add",.errStream,.outStream,filenames(i)) + do ..RunGitCommand("add",.errStream,.outStream,filenames(i),"--intent-to-add") write !, "Added ", FileInternalName, " to source control." do ..PrintStreams(outStream, errStream) }