Skip to content

Commit 6e798ed

Browse files
committed
did some cleanups as requested by review
1 parent 212b988 commit 6e798ed

File tree

4 files changed

+18
-19
lines changed

4 files changed

+18
-19
lines changed

cls/SourceControl/Git/Extension.cls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Method UserAction(Type As %Integer, Name As %String, InternalName As %String, Se
5050
set Name = "%SourceMenu,Status"
5151
}
5252

53-
if Type = 1, Name = 1 {
53+
if (Type = 1) && ((Name = 1) || (Name = 7)) {
5454
do ..AddToSourceControl(InternalName)
5555
}
5656

cls/SourceControl/Git/Utils.cls

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -349,14 +349,14 @@ ClassMethod SwitchBranch(targetBranchName As %String) As %Status
349349

350350
ClassMethod PreSync() As %String
351351
{
352-
set uncommittedFilesWithAction = ##class(SourceControl.Git.WebUIDriver).UncommittedWithAction().%Get("current user's changes")
352+
set uncommittedFilesWithAction = ##class(SourceControl.Git.WebUIDriver).UncommittedWithAction().%Get("user")
353353
quit ..GenerateCommitMessageFromFiles(uncommittedFilesWithAction)
354354
}
355355

356356
/// Commits all the files as needed by the Sync operation
357357
ClassMethod SyncCommit(Msg As %String) As %Status
358358
{
359-
set uncommittedFilesWithAction = ##class(SourceControl.Git.WebUIDriver).UncommittedWithAction().%Get("current user's changes")
359+
set uncommittedFilesWithAction = ##class(SourceControl.Git.WebUIDriver).UncommittedWithAction().%Get("user")
360360
set username = ..GitUserName()
361361
set email = ..GitUserEmail()
362362
set author = username_" <"_email_">"
@@ -370,7 +370,7 @@ ClassMethod SyncCommit(Msg As %String) As %Status
370370
/// Goes through all the added files and stages them
371371
ClassMethod StageAddedFiles()
372372
{
373-
set uncommittedFilesWithAction = ##class(SourceControl.Git.WebUIDriver).UncommittedWithAction().%Get("current user's changes")
373+
set uncommittedFilesWithAction = ##class(SourceControl.Git.WebUIDriver).UncommittedWithAction().%Get("user")
374374
set iterator = uncommittedFilesWithAction.%GetIterator()
375375
while iterator.%GetNext(,.value,) {
376376
set file = value.%Get("file")
@@ -1570,7 +1570,7 @@ ClassMethod RunGitCommand(command As %String, Output errStream, Output outStream
15701570
ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", Output errStream, Output outStream, args...) As %Integer
15711571
{
15721572
// Special case: git --version is used internally even when the settings incorporated here may be invalid/unspecified.
1573-
if (command '= "--version") && (command '= "remote") {
1573+
if (command '= "--version") {
15741574
set newArgs($increment(newArgs)) = "-C"
15751575
set newArgs($increment(newArgs)) = ..TempFolder()
15761576

@@ -1639,18 +1639,19 @@ ClassMethod GenerateCommitMessageFromFiles(filesWithActions) As %String
16391639
set action = value.%Get("action")
16401640
set file = value.%Get("file")
16411641

1642+
set oneFileMsg = $Case(action,
1643+
"A":"added",
1644+
"M": "modified",
1645+
"D": "deleted",
1646+
"R": "renamed",
1647+
"U": "updated",
1648+
: "???"
1649+
)_ " "_file
16421650

1643-
if action = "A" {
1644-
set commitMsg = commitMsg _ "added " _ file _ ", "
1645-
} elseif action = "M" {
1646-
set commitMsg = commitMsg _ "modified " _ file _ ", "
1647-
} elseif action = "D" {
1648-
set commitMsg = commitMsg _ "deleted " _ file _ ", "
1649-
} elseif action = "R" {
1650-
set commitMsg = commitMsg _ "renamed " _ file _ ", "
1651-
}
1651+
set commitMsg = commitMsg_$LISTBUILD(oneFileMsg)
1652+
16521653
}
1653-
quit commitMsg
1654+
quit $LISTTOSTRING(commitMsg, ",")
16541655
}
16551656

16561657
ClassMethod GitStatus(ByRef files, IncludeAllFiles = 0)

cls/SourceControl/Git/WebUIDriver.cls

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,8 @@ ClassMethod UncommittedWithAction() As %SystemBase
236236
}
237237
}
238238

239-
do fileToOtherDevelopers.%Set("current user's changes", editedByCurrentUser)
240-
do fileToOtherDevelopers.%Set("other users' changes", ##class(SourceControl.Git.Change).GetOtherDeveloperChanges())
239+
do fileToOtherDevelopers.%Set("user", editedByCurrentUser)
240+
do fileToOtherDevelopers.%Set("other", ##class(SourceControl.Git.Change).GetOtherDeveloperChanges())
241241
quit fileToOtherDevelopers
242242
}
243243

git-webui/src/share/git-webui/webui/js/git-webui.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2147,9 +2147,7 @@ webui.ChangedFilesView = function(workspaceView, type, label) {
21472147
var col = type == "working-copy" ? 1 : 0;
21482148
webui.git("status -u --porcelain", function(data) {
21492149
$.get("api/uncommitted", function (uncommitted) {
2150-
console.log(uncommitted);
21512150
var uncommittedItems = JSON.parse(uncommitted)["current user's changes"];
2152-
console.log(uncommittedItems);
21532151
var otherDeveloperUncommittedItems = JSON.parse(uncommitted)["other users' changes"];
21542152
self.filesCount = 0;
21552153
function addItemToFileList(fileList, otherDeveloperUsername, model) {

0 commit comments

Comments
 (0)