Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 370235
Collapse All | Expand All

(-)a/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommands.js (-4 / +6 lines)
Lines 838-845 Link Here
838
						display.Severity = "Ok";
838
						display.Severity = "Ok";
839
						display.HTML = false;
839
						display.HTML = false;
840
						display.Message = result.jsonData.Result;
840
						display.Message = result.jsonData.Result;
841
					}
841
						
842
					else if(result.jsonData){
842
						dojo.hitch(explorer, explorer.changedItem)(item);
843
					} else if(result.jsonData){
843
						var statusLocation = item.HeadLocation.replace("commit/HEAD", "status");
844
						var statusLocation = item.HeadLocation.replace("commit/HEAD", "status");
844
845
845
						display.Severity = "Warning";
846
						display.Severity = "Warning";
Lines 860-866 Link Here
860
							+ statusLocation + "\">Git Status page</a>.<span>";
861
							+ statusLocation + "\">Git Status page</a>.<span>";
861
					}
862
					}
862
863
863
					dojo.hitch(explorer, explorer.changedItem)(item);
864
					progressService.setProgressResult(display);
864
					progressService.setProgressResult(display);
865
				}, function (error, ioArgs) {
865
				}, function (error, ioArgs) {
866
						var display = [];
866
						var display = [];
Lines 901-906 Link Here
901
						display.Severity = "Ok";
901
						display.Severity = "Ok";
902
						display.HTML = false;
902
						display.HTML = false;
903
						display.Message = jsonData.Result;
903
						display.Message = jsonData.Result;
904
						
905
						dojo.hitch(explorer, explorer.changedItem)(item);
904
					}
906
					}
905
					// handle special cases
907
					// handle special cases
906
					else if (jsonData.Result == "STOPPED") {
908
					else if (jsonData.Result == "STOPPED") {
Lines 943-949 Link Here
943
							+ ". Go to <a href=\"" + require.toUrl("git/git-status.html") + "#"
945
							+ ". Go to <a href=\"" + require.toUrl("git/git-status.html") + "#"
944
							+ statusLocation +"\">Git Status page</a>.<span>";
946
							+ statusLocation +"\">Git Status page</a>.<span>";
945
					} 
947
					} 
946
					dojo.hitch(explorer, explorer.changedItem)(item);
948
947
					serviceRegistry.getService("orion.page.message").setProgressResult(display);
949
					serviceRegistry.getService("orion.page.message").setProgressResult(display);
948
					}, 
950
					}, 
949
					displayErrorOnStatus
951
					displayErrorOnStatus

Return to bug 370235