Skip to content

Refresh uncommitted #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 22, 2022
Merged

Refresh uncommitted #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions cls/SourceControl/Git/Change.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ ClassMethod IsUncommitted(Filename, ByRef ID) As %Boolean
}

/// Goes through Uncommitted queue and removes any items of action 'edit' or 'add' which are ReadOnly or non-existent on the filesystem
ClassMethod RefreshUncommitted(Display = 1, IncludeRevert = 0) As %Status
ClassMethod RefreshUncommitted(Display = 0, IncludeRevert = 0) As %Status
{
// files from the uncommitted queue
set sc=..ListUncommitted(.tFileList,IncludeRevert,0)
Expand All @@ -88,21 +88,42 @@ ClassMethod RefreshUncommitted(Display = 1, IncludeRevert = 0) As %Status
// files from git status
do ##class(Utils).GitStatus(.gitFiles)

// Remove entries in the uncommitted queue that don't correspond to changes as tracked by git
set filename="", filename=$order(tFileList(filename),1,action)
while (filename'="") {
set examine=$select(action="add":1,action="edit":1,IncludeRevert&&(action="revert"):1,1:0)
while (filename'="") {
set examine=$select(action="add":1,action="edit":1,action="delete":1, IncludeRevert&&(action="revert"):1,1:0)
if 'examine set filename=$order(tFileList(filename),1,action) continue

set InternalName = ##class(SourceControl.Git.Utils).NameToInternalName(filename,0,0)

if (('##class(%File).Exists(filename)) || ((InternalName '= "") && ('$data(gitFiles(InternalName), found)) && ($data($$$TrackedItems(InternalName))))) {
if (('##class(%File).Exists(filename)) || (InternalName = "") || ((InternalName '= "") && ('$data(gitFiles(InternalName), found)) &&
(($data($$$TrackedItems(InternalName))) || ##class(SourceControl.Git.Utils).NormalizeExtension($data($$$TrackedItems(InternalName)))))) {
set sc=..RemoveUncommitted(filename,Display,0,0)
if $$$ISERR(sc) set filename="" continue
}
set filename=$order(tFileList(filename),1,action)
}

// Add missing records to the uncommitted queue that correspond to changes as tracked by git
set filename="", filename=$order(gitFiles(filename),1,details)
while (filename'="") {
set InternalName = filename
set ExternalName = ##class(%File).NormalizeFilename(##class(SourceControl.Git.Utils).TempFolder()_$list(details,2))
set changeType = $list(details,1)

set action = $select(changeType="A":"add",
changeType="M":"edit",
changeType="D":"delete",
changeType="U":"add",
1:"add")

if ((##class(%File).Exists(ExternalName)) && ('$ISVALIDNUM(InternalName)) && ('..IsUncommitted(ExternalName)) && ($data($$$TrackedItems(InternalName)))) {
set sc=..SetUncommitted(ExternalName, action, InternalName, $USERNAME, "", 1, "", "", 0)
if $$$ISERR(sc) w sc set filename="" continue
}
set filename=$order(gitFiles(filename),1,details)
}
quit sc
}

}

1 change: 1 addition & 0 deletions cls/SourceControl/Git/Extension.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ Method GetStatus(InternalName As %String, ByRef IsInSourceControl As %Boolean, B
if '$$$FileExists(filename) {
set IsCheckedOut=0
}
do ##class(SourceControl.Git.Change).RefreshUncommitted()
do ##class(SourceControl.Git.Utils).GitStatus(.files)
if $get(files(InternalName)) '= "" {
///it's in source control, checked out, and should be locked to editing by other users
Expand Down
5 changes: 4 additions & 1 deletion cls/SourceControl/Git/WebUIDriver.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
if $piece(pagePath,"/",3) = "cat-file" {
set file = $piece(pagePath,"/",4,*)
do ##class(SourceControl.Git.Utils).RunGitCommand("-c",,.%data,"color.ui=false","cat-file","-p",file)
do ##class(SourceControl.Git.Change).RefreshUncommitted()
set handled = 1
}
} elseif (pathStart = "hostname") {
Expand Down Expand Up @@ -133,6 +134,7 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
do %data.WriteLine("Git-Stderr-Length: " _ (errStream.Size + nLines))
do %data.Write("Git-Return-Code: " _ returnCode) // No ending newline expected
do %data.Rewind()
do ##class(SourceControl.Git.Change).RefreshUncommitted()
set handled = 1
}
}
Expand All @@ -151,7 +153,8 @@ ClassMethod UserInfo() As %SystemBase
ClassMethod Uncommitted() As %SystemBase
{
// Stub
do ##class(Utils).GitStatus(.files, 1)
do ##class(SourceControl.Git.Change).RefreshUncommitted()
do ##class(SourceControl.Git.Utils).GitStatus(.files, 1)
set output = ""
set key = ""

Expand Down