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 361013 | Differences between
and this patch

Collapse All | Expand All

(-)a/bundles/org.eclipse.orion.client.git/web/git/git-clone.html (-5 / +5 lines)
Lines 1-12 Link Here
1 
<!doctype html>
 1 
<!doctype html>
2 
<html style="height: 100%" >
 2 
<html style="height: 100%" >
3 
    <head>
 3 
	<head>
4 
		<meta name="copyright" content="Copyright (c) IBM Corporation and others 2010, 2011." >
 4 
		<meta name="copyright" content="Copyright (c) IBM Corporation and others 2010, 2011." >
5 
		<meta http-equiv="Content-Language" content="en-us">
 5 
		<meta http-equiv="Content-Language" content="en-us">
6 
		<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 6 
		<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
7 
    	<title>Git Clones</title>
 7 
		<title>Git Repositories</title>
8 
    	<link rel="stylesheet" type="text/css" href="git-clone.css" />
 8 
		<link rel="stylesheet" type="text/css" href="git-clone.css" />
9 
   	<script type="text/javascript" src="../requirejs/require.js"></script>
 9 
	<script type="text/javascript" src="../requirejs/require.js"></script>
10 
		<script type="text/javascript">
 10 
		<script type="text/javascript">
11 
		require({
 11 
		require({
12 
			  baseUrl: '..',
 12 
			  baseUrl: '..',
Lines 56-62 Link Here
56 
			<div class="mainpane" id="rightPane" dojoType="dijit.layout.ContentPane" region="center" splitter="false">
 56 
			<div class="mainpane" id="rightPane" dojoType="dijit.layout.ContentPane" region="center" splitter="false">
57 
				<div id="explorer-tree" class="navigator" style="margin-left: 16px">
 57 
				<div id="explorer-tree" class="navigator" style="margin-left: 16px">
58 
					<div id="clonesList" style="min-width: 500px">
 58 
					<div id="clonesList" style="min-width: 500px">
59 
					<div  id="clonesProgress">Loading git clones...</div>
 59 
					<div  id="clonesProgress">Loading git repositories...</div>
60 
					</div>
 60 
					</div>
61 
				</div>
 61 
				</div>
62 
			</div>
 62 
			</div>
(-)a/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommands.js (-13 / +13 lines)
Lines 318-329 var exports = {}; Link Here
318 
		commandService.addCommand(addBranchCommand, "object");
 318 
		commandService.addCommand(addBranchCommand, "object");
319
319
320 
		var removeBranchCommand = new mCommands.Command({
 320 
		var removeBranchCommand = new mCommands.Command({
321 
			name: "Remove", // "Remove Branch"
 321 
			name: "Delete", // "Delete Branch"
322 
			tooltip: "Remove the local branch from the repository",
 322 
			tooltip: "Delete the local branch from the repository",
323 
			imageClass: "core-sprite-delete",
 323 
			imageClass: "core-sprite-delete",
324 
			id: "eclipse.removeBranch",
 324 
			id: "eclipse.removeBranch",
325 
			callback: function(item) {
 325 
			callback: function(item) {
326 
				if(confirm("Are you sure you want to remove branch " + item.Name+"?"))
 326 
				if(confirm("Are you sure you want to delete branch " + item.Name+"?"))
327 
				serviceRegistry.getService("orion.git.provider").then(
 327 
				serviceRegistry.getService("orion.git.provider").then(
328 
					function(service) {
 328 
					function(service) {
329 
						service.removeBranch(item.Location).then(
 329 
						service.removeBranch(item.Location).then(
Lines 341-352 var exports = {}; Link Here
341 
		commandService.addCommand(removeBranchCommand, "object");
 341 
		commandService.addCommand(removeBranchCommand, "object");
342
342
343 
		var removeRemoteBranchCommand = new mCommands.Command({
 343 
		var removeRemoteBranchCommand = new mCommands.Command({
344 
			name: "Remove", // "Remove Remote Branch",
 344 
			name: "Delete", // "Delete Remote Branch",
345 
			tooltip: "Remove the remote tracking branch from the repository",
 345 
			tooltip: "Delete the remote tracking branch from the repository",
346 
			imageClass: "core-sprite-delete",
 346 
			imageClass: "core-sprite-delete",
347 
			id: "eclipse.removeRemoteBranch",
 347 
			id: "eclipse.removeRemoteBranch",
348 
			callback: function(item) {
 348 
			callback: function(item) {
349 
				if(confirm("You're going to remove remote branch " + item.Name+" and push the change.\n\nAre you sure?"))
 349 
				if(confirm("You're going to delete remote branch " + item.Name+" and push the change.\n\nAre you sure?"))
350 
				exports.getDefaultSshOptions(serviceRegistry).then(function(options){
 350 
				exports.getDefaultSshOptions(serviceRegistry).then(function(options){
351 
						var func = arguments.callee;
 351 
						var func = arguments.callee;
352 
						serviceRegistry.getService("orion.git.provider").then(function(gitService) {
 352 
						serviceRegistry.getService("orion.git.provider").then(function(gitService) {
Lines 357-363 var exports = {}; Link Here
357 
											function(jsonData){
 357 
											function(jsonData){
358 
												if (jsonData.Result.Severity == "Ok")
 358 
												if (jsonData.Result.Severity == "Ok")
359 
													dojo.hitch(explorer, explorer.changedItem)(item.parent);
 359 
													dojo.hitch(explorer, explorer.changedItem)(item.parent);
360 
											}, func, "Remove Remote Branch");
 360 
											}, func, "Delete Remote Branch");
361 
									});
 361 
									});
362 
								});
 362 
								});
363 
							});
 363 
							});
Lines 396-407 var exports = {}; Link Here
396 
		commandService.addCommand(addRemoteCommand, "object");
 396 
		commandService.addCommand(addRemoteCommand, "object");
397
397
398 
		var removeRemoteCommand = new mCommands.Command({
 398 
		var removeRemoteCommand = new mCommands.Command({
399 
			name: "Remove", // "Remove Remote",
 399 
			name: "Delete", // "Delete Remote",
400 
			tooltip: "Remove the remote from the repository",
 400 
			tooltip: "Delete the remote from the repository",
401 
			imageClass: "core-sprite-delete",
 401 
			imageClass: "core-sprite-delete",
402 
			id: "eclipse.removeRemote",
 402 
			id: "eclipse.removeRemote",
403 
			callback: function(item) {
 403 
			callback: function(item) {
404 
				if(confirm("Are you sure you want to remove remote " + item.Name+"?"))
 404 
				if(confirm("Are you sure you want to delete remote " + item.Name+"?"))
405 
				serviceRegistry.getService("orion.git.provider").then(
 405 
				serviceRegistry.getService("orion.git.provider").then(
406 
					function(service) {
 406 
					function(service) {
407 
						service.removeRemote(item.Location).then(
 407 
						service.removeRemote(item.Location).then(
Lines 1156-1162 var exports = {}; Link Here
1156
1156
1157 
		var resetIndexCommand = new mCommands.Command({
 1157 
		var resetIndexCommand = new mCommands.Command({
1158 
			name : "Reset",
 1158 
			name : "Reset",
1159 
			tooltip: "Reset your active branch to the state of the selected branch. Remove all staged and unstaged changes.",
 1159 
			tooltip: "Reset your active branch to the state of the selected branch. Discard all staged and unstaged changes.",
1160 
			imageClass: "git-sprite-refresh",
 1160 
			imageClass: "git-sprite-refresh",
1161 
			spriteClass: "gitCommandSprite",
 1161 
			spriteClass: "gitCommandSprite",
1162 
			id : "eclipse.orion.git.resetIndex",
 1162 
			id : "eclipse.orion.git.resetIndex",
Lines 1670-1677 var exports = {}; Link Here
1670 
		commandService.addCommand(initGitRepositoryCommand, "dom");
 1670 
		commandService.addCommand(initGitRepositoryCommand, "dom");
1671
1671
1672 
		var deleteCommand = new mCommands.Command({
 1672 
		var deleteCommand = new mCommands.Command({
1673 
			name: "Remove", // "Remove Clone"
 1673 
			name: "Delete", // "Delete Repository"
1674 
			tooltip: "Remove the repository",
 1674 
			tooltip: "Delete the repository",
1675 
			imageClass: "core-sprite-delete",
 1675 
			imageClass: "core-sprite-delete",
1676 
			id: "eclipse.git.deleteClone",
 1676 
			id: "eclipse.git.deleteClone",
1677 
			visibleWhen: function(item) {
 1677 
			visibleWhen: function(item) {

Return to bug 361013