Skip to content

Commit d9766b9

Browse files
isc-hwojnickisc-hwojnick
committed
merged main into branch
2 parents 14c0ba7 + 45a86e7 commit d9766b9

File tree

5 files changed

+225
-44
lines changed

5 files changed

+225
-44
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [2.4.1] - Unreleased
99

10+
### Added
11+
- New API endpoint that accepts git commands as array instead of string (#437)
12+
1013
### Fixed
1114
- Fixed JS errors in Studio on certain operations (#416)
1215
- Add menu option disabled for unsaved files (#420)

‎cls/SourceControl/Git/Utils.cls‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1786,7 +1786,7 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
17861786
set buffer = ##class(SourceControl.Git.Util.Buffer).%New()
17871787
do buffer.BeginCaptureOutput()
17881788
set st = ..SyncIrisWithRepoThroughCommand(.outStream)
1789-
set out = ##class(%Stream.Global).%New()
1789+
set out = ##class(%Stream.GlobalCharacter).%New()
17901790
do buffer.EndCaptureOutput(.out)
17911791
if $$$ISOK(st) {
17921792
while 'out.AtEnd {

‎cls/SourceControl/Git/WebUIDriver.cls‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
2929
if $isobject($get(responseJSON)) {
3030
do responseJSON.%ToJSON(%data)
3131
}
32-
} elseif $match(pathStart,"git|dirname|hostname|viewonly|contexts") {
32+
} elseif $match(pathStart,"git-command|git|dirname|hostname|viewonly|contexts") {
3333
if (%request.Method = "GET") {
3434
set %data = ##class(%Stream.TmpCharacter).%New()
3535
// Things not handled from Python backend:
@@ -165,6 +165,40 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
165165
do ##class(SourceControl.Git.Change).RefreshUncommitted(,,,1)
166166
}
167167
set handled = 1
168+
} elseif (pathStart = "git-command") {
169+
set requestBody = ##class(%Library.DynamicObject).%FromJSON(%request.Content)
170+
set command = requestBody.command
171+
172+
set argsArr = ""
173+
set argsArr($increment(argsArr)) = "color.ui=true"
174+
set iterator = command.%GetIterator()
175+
while iterator.%GetNext(,.value) {
176+
set argsArr($increment(argsArr)) = value
177+
}
178+
179+
set inFile = ""
180+
181+
set returnCode = ##class(SourceControl.Git.Utils).RunGitCommandWithInput("-c", inFile, .errStream, .outStream, argsArr...)
182+
set %data = ##class(%Stream.TmpCharacter).%New()
183+
set changeTerminators = (%data.LineTerminator '= $char(13,10))
184+
set %data.LineTerminator = $char(13,10) // For the CSPGateway.
185+
while 'outStream.AtEnd {
186+
do %data.WriteLine(outStream.ReadLine())
187+
}
188+
189+
set nLines = 0
190+
while 'errStream.AtEnd {
191+
do %data.WriteLine(errStream.ReadLine())
192+
set:changeTerminators nLines = nLines + 1
193+
}
194+
195+
// Need to write out two lines or we get an infinite loop in JavaScript...
196+
do %data.WriteLine()
197+
do %data.WriteLine()
198+
do %data.WriteLine("Git-Stderr-Length: " _ (errStream.Size + nLines))
199+
do %data.Write("Git-Return-Code: " _ returnCode) // No ending newline expected
200+
do %data.Rewind()
201+
set handled = 1
168202
}
169203
}
170204
}

‎git-webui/release/share/git-webui/webui/js/git-webui.js‎

Lines changed: 93 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,89 @@ webui.showWarning = function(message) {
110110
'</div>').appendTo(messageBox);
111111
}
112112

113+
webui.git_command = function(command, callback) {
114+
$.ajax({
115+
url: "git-command",
116+
type: "POST",
117+
contentType: 'application/json',
118+
data: JSON.stringify({
119+
command: command
120+
}),
121+
success: function(data) {
122+
// Convention : last lines are footer meta data like headers. An empty line marks the start if the footers
123+
var footers = {};
124+
var fIndex = data.length;
125+
while (true) {
126+
var oldFIndex = fIndex;
127+
fIndex = data.lastIndexOf("\r\n", fIndex - 1);
128+
var line = data.substring(fIndex + 2, oldFIndex);
129+
if (line.length > 0) {
130+
var footer = line.split(": ");
131+
footers[footer[0]] = footer[1];
132+
} else {
133+
break;
134+
}
135+
}
136+
// Trims the the data variable to remove the footers extracted in the loop.
137+
// Windows adds \r\n for every line break but the Git-Stderr-Length variable,
138+
// counts it as only one character, throwing off the message length.
139+
var trimmedData = data.substring(0, fIndex).replace(/(\r\n)/gm, "\n");
140+
var fIndex = trimmedData.length
141+
142+
var messageLength = parseInt(footers["Git-Stderr-Length"]);
143+
var messageStartIndex = fIndex-messageLength;
144+
var message = trimmedData.substring(messageStartIndex, fIndex);
145+
146+
var output = trimmedData.substring(0, messageStartIndex);
147+
var rcode = parseInt(footers["Git-Return-Code"]);
148+
149+
if (rcode == 0) {
150+
if (callback) {
151+
callback(output);
152+
}
153+
// Return code is 0 but there is stderr output: this is a warning message
154+
if (message.length > 0) {
155+
if(warningCallback) {
156+
warningCallback(message);
157+
} else {
158+
webui.showWarning(message);
159+
}
160+
}
161+
} else {
162+
var displayMessage = ""
163+
if(output.length > 0){
164+
displayMessage += (output+"\n");
165+
}
166+
if(message.length > 0){
167+
displayMessage += message;
168+
}
169+
if(displayMessage.length > 0){
170+
// if(errorCallback) {
171+
// errorCallback(displayMessage);
172+
// } else{
173+
if(displayMessage.indexOf("self.document.Login") != -1){
174+
location.reload();
175+
return false;
176+
}
177+
webui.showError(displayMessage);
178+
//}
179+
} else {
180+
webui.showError("The command <pre>"+command.join(" ")+"</pre> failed because of an unknown reason. Returned response: \n\n"+data)
181+
}
182+
}
183+
},
184+
error: function(data) {
185+
var trimmedData = data.substring(0, fIndex).replace(/(\r\n)/gm, "\n");
186+
var fIndex = trimmedData.length
187+
188+
var messageLength = parseInt(footers["Git-Stderr-Length"]);
189+
var messageStartIndex = fIndex-messageLength;
190+
var message = trimmedData.substring(messageStartIndex, fIndex);
191+
webui.showError(message);
192+
},
193+
});
194+
}
195+
113196
webui.git = function(cmd, arg1, arg2, arg3, arg4) {
114197
// cmd = git command line arguments
115198
// other arguments = optional stdin content and a callback function.
@@ -2649,43 +2732,32 @@ webui.NewChangedFilesView = function(workspaceView) {
26492732
}
26502733

26512734
self.amend = function(message, details) {
2652-
var selectedFilesAsString = selectedItems.join(" ");
2653-
message = self.doubleQuotesToSingleQuotes(message);
2654-
details = self.doubleQuotesToSingleQuotes(details);
26552735

26562736
if (self.commitMsgEmpty()) {
2657-
webui.git("add " + selectedFilesAsString);
2658-
webui.git("commit --amend --no-edit -- " + selectedFilesAsString, function(output) {
2737+
webui.git_command(["add"].concat(selectedItems));
2738+
webui.git_command(['commit', '--amend', '--no-edit', '--'].concat(selectedItems), function(output) {
26592739
webui.showSuccess(output);
26602740
workspaceView.update();
2661-
})
2741+
});
26622742
} else if (selectedItems.length != 0) {
2663-
webui.git("add " + selectedFilesAsString);
2664-
webui.git('commit --amend -m "' + message + '" -m "' + details + '" -- ' + selectedFilesAsString, function(output) {
2743+
webui.git_command(["add"].concat(selectedItems));
2744+
webui.git_command(['commit', '--amend', '-m', message, '-m', details, '--'].concat(selectedItems), function(output) {
26652745
webui.showSuccess(output);
26662746
workspaceView.update();
2667-
})
2747+
});
26682748
} else {
2669-
webui.git('commit --amend --allow-empty -m "' + message + '" -m "' + details + '"', function(output) {
2749+
webui.git_command(['commit', '--amend', '--allow-empty', '-m', message, '-m', details], function(output) {
26702750
webui.showSuccess(output);
26712751
workspaceView.update();
2672-
})
2752+
});
26732753
}
26742754

26752755

26762756
}
26772757

2678-
self.doubleQuotesToSingleQuotes = function(string) {
2679-
return string.replace(/"/g, "'");
2680-
}
2681-
26822758
self.commit = function(message, details) {
2683-
var selectedFilesAsString = selectedItems.join(" ");
2684-
message = self.doubleQuotesToSingleQuotes(message);
2685-
details = self.doubleQuotesToSingleQuotes(details);
2686-
2687-
webui.git("add " + selectedFilesAsString);
2688-
webui.git('commit -m "' + message + '" -m "' + details + '" -- ' + selectedFilesAsString, function(output) {
2759+
webui.git_command(["add"].concat(selectedItems));
2760+
webui.git_command(['commit', '-m', message, '-m', details, '--'].concat(selectedItems), function(output) {
26892761
webui.showSuccess(output);
26902762
workspaceView.update();
26912763
});

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

Lines changed: 93 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,89 @@ webui.showWarning = function(message) {
110110
'</div>').appendTo(messageBox);
111111
}
112112

113+
webui.git_command = function(command, callback) {
114+
$.ajax({
115+
url: "git-command",
116+
type: "POST",
117+
contentType: 'application/json',
118+
data: JSON.stringify({
119+
command: command
120+
}),
121+
success: function(data) {
122+
// Convention : last lines are footer meta data like headers. An empty line marks the start if the footers
123+
var footers = {};
124+
var fIndex = data.length;
125+
while (true) {
126+
var oldFIndex = fIndex;
127+
fIndex = data.lastIndexOf("\r\n", fIndex - 1);
128+
var line = data.substring(fIndex + 2, oldFIndex);
129+
if (line.length > 0) {
130+
var footer = line.split(": ");
131+
footers[footer[0]] = footer[1];
132+
} else {
133+
break;
134+
}
135+
}
136+
// Trims the the data variable to remove the footers extracted in the loop.
137+
// Windows adds \r\n for every line break but the Git-Stderr-Length variable,
138+
// counts it as only one character, throwing off the message length.
139+
var trimmedData = data.substring(0, fIndex).replace(/(\r\n)/gm, "\n");
140+
var fIndex = trimmedData.length
141+
142+
var messageLength = parseInt(footers["Git-Stderr-Length"]);
143+
var messageStartIndex = fIndex-messageLength;
144+
var message = trimmedData.substring(messageStartIndex, fIndex);
145+
146+
var output = trimmedData.substring(0, messageStartIndex);
147+
var rcode = parseInt(footers["Git-Return-Code"]);
148+
149+
if (rcode == 0) {
150+
if (callback) {
151+
callback(output);
152+
}
153+
// Return code is 0 but there is stderr output: this is a warning message
154+
if (message.length > 0) {
155+
if(warningCallback) {
156+
warningCallback(message);
157+
} else {
158+
webui.showWarning(message);
159+
}
160+
}
161+
} else {
162+
var displayMessage = ""
163+
if(output.length > 0){
164+
displayMessage += (output+"\n");
165+
}
166+
if(message.length > 0){
167+
displayMessage += message;
168+
}
169+
if(displayMessage.length > 0){
170+
// if(errorCallback) {
171+
// errorCallback(displayMessage);
172+
// } else{
173+
if(displayMessage.indexOf("self.document.Login") != -1){
174+
location.reload();
175+
return false;
176+
}
177+
webui.showError(displayMessage);
178+
//}
179+
} else {
180+
webui.showError("The command <pre>"+command.join(" ")+"</pre> failed because of an unknown reason. Returned response: \n\n"+data)
181+
}
182+
}
183+
},
184+
error: function(data) {
185+
var trimmedData = data.substring(0, fIndex).replace(/(\r\n)/gm, "\n");
186+
var fIndex = trimmedData.length
187+
188+
var messageLength = parseInt(footers["Git-Stderr-Length"]);
189+
var messageStartIndex = fIndex-messageLength;
190+
var message = trimmedData.substring(messageStartIndex, fIndex);
191+
webui.showError(message);
192+
},
193+
});
194+
}
195+
113196
webui.git = function(cmd, arg1, arg2, arg3, arg4) {
114197
// cmd = git command line arguments
115198
// other arguments = optional stdin content and a callback function.
@@ -2649,43 +2732,32 @@ webui.NewChangedFilesView = function(workspaceView) {
26492732
}
26502733

26512734
self.amend = function(message, details) {
2652-
var selectedFilesAsString = selectedItems.join(" ");
2653-
message = self.doubleQuotesToSingleQuotes(message);
2654-
details = self.doubleQuotesToSingleQuotes(details);
26552735

26562736
if (self.commitMsgEmpty()) {
2657-
webui.git("add " + selectedFilesAsString);
2658-
webui.git("commit --amend --no-edit -- " + selectedFilesAsString, function(output) {
2737+
webui.git_command(["add"].concat(selectedItems));
2738+
webui.git_command(['commit', '--amend', '--no-edit', '--'].concat(selectedItems), function(output) {
26592739
webui.showSuccess(output);
26602740
workspaceView.update();
2661-
})
2741+
});
26622742
} else if (selectedItems.length != 0) {
2663-
webui.git("add " + selectedFilesAsString);
2664-
webui.git('commit --amend -m "' + message + '" -m "' + details + '" -- ' + selectedFilesAsString, function(output) {
2743+
webui.git_command(["add"].concat(selectedItems));
2744+
webui.git_command(['commit', '--amend', '-m', message, '-m', details, '--'].concat(selectedItems), function(output) {
26652745
webui.showSuccess(output);
26662746
workspaceView.update();
2667-
})
2747+
});
26682748
} else {
2669-
webui.git('commit --amend --allow-empty -m "' + message + '" -m "' + details + '"', function(output) {
2749+
webui.git_command(['commit', '--amend', '--allow-empty', '-m', message, '-m', details], function(output) {
26702750
webui.showSuccess(output);
26712751
workspaceView.update();
2672-
})
2752+
});
26732753
}
26742754

26752755

26762756
}
26772757

2678-
self.doubleQuotesToSingleQuotes = function(string) {
2679-
return string.replace(/"/g, "'");
2680-
}
2681-
26822758
self.commit = function(message, details) {
2683-
var selectedFilesAsString = selectedItems.join(" ");
2684-
message = self.doubleQuotesToSingleQuotes(message);
2685-
details = self.doubleQuotesToSingleQuotes(details);
2686-
2687-
webui.git("add " + selectedFilesAsString);
2688-
webui.git('commit -m "' + message + '" -m "' + details + '" -- ' + selectedFilesAsString, function(output) {
2759+
webui.git_command(["add"].concat(selectedItems));
2760+
webui.git_command(['commit', '-m', message, '-m', details, '--'].concat(selectedItems), function(output) {
26892761
webui.showSuccess(output);
26902762
workspaceView.update();
26912763
});

0 commit comments

Comments
 (0)