Skip to content

Commit 5a78a6d

Browse files
committed
Changed ordering
1 parent 639f4da commit 5a78a6d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

cls/SourceControl/Git/Extension.cls

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ Method UserAction(Type As %Integer, Name As %String, InternalName As %String, Se
6262
do ..GetStatus(.InternalName, .isInSourceControl, .isEditable,.isCheckedOut,.userCheckedOut)
6363
if '$data(tAction) {
6464
set user = "", inNamespace = ""
65-
if ##class(SourceControl.Git.Utils).InstanceWideUncommittedCheck(InternalName, .user, .inNamespace) {
66-
set Target = "Warning: Item " _ InternalName _ " is currently being modified by " _ user _ " in namespace " _ inNamespace _ "."
65+
if 'isEditable || ##class(SourceControl.Git.Utils).Locked() {
66+
set Target = "Warning: Attempting to edit read-only file"
6767
write !, Target
6868
set Action = 6
69-
} elseif 'isEditable || ##class(SourceControl.Git.Utils).Locked() {
70-
set Target = "Warning: Attempting to edit read-only file"
69+
} elseif ##class(SourceControl.Git.Utils).InstanceWideUncommittedCheck(InternalName, .user, .inNamespace) {
70+
set Target = "Warning: Item " _ InternalName _ " is currently being modified by " _ user _ " in namespace " _ inNamespace _ "."
7171
write !, Target
7272
set Action = 6
73-
}
73+
}
7474
}
7575
}
7676
}

0 commit comments

Comments
 (0)