Skip to content
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

Jump to bottom

Don't show Failed to Import popup after overwriting the file on server once #311

Merged
merged 4 commits into from
Jan 4, 2024
Merged

Don't show Failed to Import popup after overwriting the file on server once #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ade4490
prevent overwrite server popup from showing up for every change
isc-vgao Jan 4, 2024
09b2afc
prevent overwrite server popup from showing up for every change
isc-vgao Jan 4, 2024
6424cf3
add overwrite server popup to CHANGELOG fixed
isc-vgao Jan 4, 2024
6d56765
Merge branch 'overwrite-server-popup' of github.com:intersystems/git-…
isc-vgao Jan 4, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Support for git submodules in package manager-aware setting (#305)
- Web UI's 'More ...' view shows longer branch names (#294)
- Deletion of files in locked environment is now suppressed (#302)
- Failed to import file VS Code popup no longer shows up after overwriting file on server once (#264)

## [2.3.0] - 2023-12-06

Expand Down
16 changes: 15 additions & 1 deletion cls/SourceControl/Git/Extension.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,21 @@ Method OnBeforeLoad(InternalName As %String, verbose As %Boolean) As %Status
/// Called before Studio checks for the timestamp of an item.
Method OnBeforeTimestamp(InternalName As %String)
{
set context = ##class(SourceControl.Git.PackageManagerContext).ForInternalName(InternalName)
if $IsObject($Get(%request)) {
set clientServerHash = ##class(%Atelier.REST).GetClientServerHash()
if (clientServerHash '= "") {
// suppress load / timestamp update if file on server was modified an extremely short time ago
set file = ##class(SourceControl.Git.Utils).FullExternalName(InternalName)
if (file '= "") {
set lastModifiedTime = ##class(%Library.File).GetFileDateModified(file)
set diff = $System.SQL.Functions.DATEDIFF("ms",lastModifiedTime,$h)
if (diff < 1000) {
quit
}
}
}
}
quit ..OnBeforeLoad(InternalName,0)
}

Expand Down Expand Up @@ -351,4 +366,3 @@ Method AddToSourceControl(InternalName As %String, Description As %String = "")
}

}

Loading