Merge branch 'justinhhorner-git-rename-branch' of...

Merge branch 'justinhhorner-git-rename-branch' of https://github.com/justinhhorner/vscode into justinhhorner-justinhhorner-git-rename-branch

extensions/git/package.json

@@ -219,6 +219,11 @@
         "title": "%command.deleteBranch%",
         "category": "Git"
       },
+      {
+        "command": "git.renameBranch",
+        "title": "%command.renameBranch%",
+        "category": "Git"
+      },
       {
         "command": "git.merge",
         "title": "%command.merge%",
@@ -414,6 +419,10 @@
           "command": "git.deleteBranch",
           "when": "config.git.enabled && gitOpenRepositoryCount != 0"
         },
+        {
+          "command": "git.renameBranch",
+          "when": "config.git.enabled && gitOpenRepositoryCount != 0"
+        },
         {
           "command": "git.pull",
           "when": "config.git.enabled && gitOpenRepositoryCount != 0"
@@ -921,4 +930,4 @@
     "@types/node": "7.0.43",
     "mocha": "^3.2.0"
   }
-}
+}
\ No newline at end of file

extensions/git/package.nls.json

@@ -28,6 +28,7 @@
 	"command.checkout": "Checkout to...",
 	"command.branch": "Create Branch...",
 	"command.deleteBranch": "Delete Branch...",
+	"command.renameBranch": "Rename Branch...",
 	"command.merge": "Merge Branch...",
 	"command.createTag": "Create Tag",
 	"command.pull": "Pull",

extensions/git/src/commands.ts

@@ -1139,6 +1139,31 @@ export class CommandCenter {
 		}
 	}
 
+	@command('git.renameBranch', { repository: true })
+	async renameBranch(repository: Repository): Promise<void> {
+		const placeHolder = localize('provide branch name', "Please provide a branch name");
+		const name = await window.showInputBox({ placeHolder });
+
+		if (!name || name.trim().length === 0) {
+			return;
+		}
+
+		try {
+			await repository.renameBranch(name);
+		} catch (err) {
+			switch (err.gitErrorCode) {
+				case GitErrorCodes.InvalidBranchName:
+					window.showErrorMessage(localize('invalid branch name', 'Invalid branch name'));
+					return;
+				case GitErrorCodes.BranchAlreadyExists:
+					window.showErrorMessage(localize('branch already exists', `A branch named '${name}' already exists`));
+					return;
+				default:
+					throw err;
+			}
+		}
+	}
+
 	@command('git.merge', { repository: true })
 	async merge(repository: Repository): Promise<void> {
 		const config = workspace.getConfiguration('git');

extensions/git/src/git.ts

@@ -309,6 +309,8 @@ export const GitErrorCodes = {
 	RepositoryIsLocked: 'RepositoryIsLocked',
 	BranchNotFullyMerged: 'BranchNotFullyMerged',
 	NoRemoteReference: 'NoRemoteReference',
+	InvalidBranchName: 'InvalidBranchName',
+	BranchAlreadyExists: 'BranchAlreadyExists',
 	NoLocalChanges: 'NoLocalChanges',
 	NoStashFound: 'NoStashFound',
 	LocalChangesOverwritten: 'LocalChangesOverwritten'
@@ -333,6 +335,10 @@ function getGitErrorCode(stderr: string): string | undefined {
 		return GitErrorCodes.BranchNotFullyMerged;
 	} else if (/Couldn\'t find remote ref/.test(stderr)) {
 		return GitErrorCodes.NoRemoteReference;
+	} else if (/A branch named '.+' already exists/.test(stderr)) {
+		return GitErrorCodes.BranchAlreadyExists;
+	} else if (/'.+' is not a valid branch name/.test(stderr)) {
+		return GitErrorCodes.InvalidBranchName;
 	}
 
 	return void 0;
@@ -769,6 +775,11 @@ export class Repository {
 		await this.run(args);
 	}
 
+	async renameBranch(name: string): Promise<void> {
+		const args = ['branch', '-m', name];
+		await this.run(args);
+	}
+
 	async merge(ref: string): Promise<void> {
 		const args = ['merge', ref];
 

extensions/git/src/repository.ts

@@ -296,6 +296,7 @@ export enum Operation {
 	Stage = 'Stage',
 	GetCommitTemplate = 'GetCommitTemplate',
 	DeleteBranch = 'DeleteBranch',
+	RenameBranch = 'RenameBranch',
 	Merge = 'Merge',
 	Ignore = 'Ignore',
 	Tag = 'Tag',
@@ -603,6 +604,10 @@ export class Repository implements Disposable {
 		await this.run(Operation.DeleteBranch, () => this.repository.deleteBranch(name, force));
 	}
 
+	async renameBranch(name: string): Promise<void> {
+		await this.run(Operation.RenameBranch, () => this.repository.renameBranch(name));
+	}
+
 	async merge(ref: string): Promise<void> {
 		await this.run(Operation.Merge, () => this.repository.merge(ref));
 	}