Add rename by git context menu

extensions/git/package.json

@@ -150,6 +150,12 @@
         "category": "Git",
         "icon": "$(discard)"
       },
+      {
+        "command": "git.rename",
+        "title": "%command.rename%",
+        "category": "Git",
+        "icon": "$(discard)"
+      },
       {
         "command": "git.cleanAll",
         "title": "%command.cleanAll%",
@@ -1296,6 +1302,13 @@
           "group": "5_copy@2",
           "when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/"
         }
+      ],
+      "explorer/context": [
+        {
+          "command": "git.rename",
+          "group": "7_modification",
+          "when": "config.git.enabled && !git.missing && !explorerResourceIsRoot"
+        }
       ]
     },
     "configuration": {

extensions/git/package.nls.json

@@ -21,6 +21,7 @@
 	"command.unstage": "Unstage Changes",
 	"command.unstageAll": "Unstage All Changes",
 	"command.unstageSelectedRanges": "Unstage Selected Ranges",
+	"command.rename": "Rename (Git)",
 	"command.clean": "Discard Changes",
 	"command.cleanAll": "Discard All Changes",
 	"command.cleanAllTracked": "Discard All Tracked Changes",

extensions/git/src/commands.ts

@@ -19,6 +19,7 @@ import { grep, isDescendant, pathEquals } from './util';
 import { Log, LogLevel } from './log';
 import { GitTimelineItem } from './timelineProvider';
 import { throttle, debounce } from './decorators';
+import { URI } from 'vscode-uri';
 
 const localize = nls.loadMessageBundle();
 
@@ -930,6 +931,26 @@ export class CommandCenter {
 		}
 	}
 
+	@command('git.rename', { repository: true })
+	async rename(repository: Repository, fromUri: URI): Promise<void> {
+		this.outputChannel.appendLine(`git.rename ${fromUri.fsPath}`);
+
+		const rootPath = workspace.rootPath;
+		const fromPath = workspace.asRelativePath(fromUri);
+		const fromBasename = path.basename(fromPath);
+		const toPath = await window.showInputBox({
+			value: fromPath,
+			valueSelection: [fromPath.length - fromBasename.length, fromPath.length]
+		});
+		if (!toPath?.trim()) {
+			return;
+		}
+
+		const fullToPath = path.join(rootPath || '', toPath);
+		this.outputChannel.appendLine(`git.rename from ${fromPath} to ${fullToPath}`);
+		await repository.move(fromPath, fullToPath);
+	}
+
 	@command('git.stage')
 	async stage(...resourceStates: SourceControlResourceState[]): Promise<void> {
 		this.outputChannel.appendLine(`git.stage ${resourceStates.length}`);

extensions/git/src/git.ts

@@ -1390,6 +1390,11 @@ export class Repository {
 		await this.run(args);
 	}
 
+	async move(from: string, to: string): Promise<void> {
+		const args = ['mv', from, to];
+		await this.run(args);
+	}
+
 	async setBranchUpstream(name: string, upstream: string): Promise<void> {
 		const args = ['branch', '--set-upstream-to', upstream, name];
 		await this.run(args);

extensions/git/src/repository.ts

@@ -310,6 +310,8 @@ export const enum Operation {
 	Blame = 'Blame',
 	Log = 'Log',
 	LogFile = 'LogFile',
+
+	Move = 'Move'
 }
 
 function isReadOnly(operation: Operation): boolean {
@@ -1045,6 +1047,10 @@ export class Repository implements Disposable {
 		await this.run(Operation.RenameBranch, () => this.repository.renameBranch(name));
 	}
 
+	async move(from: string, to: string): Promise<void> {
+		await this.run(Operation.Move, () => this.repository.move(from, to));
+	}
+
 	async getBranch(name: string): Promise<Branch> {
 		return await this.run(Operation.GetBranch, () => this.repository.getBranch(name));
 	}

extensions/types/lib.textEncoder.d.ts

@@ -7,5 +7,5 @@
 //
 // Proper fix: https://github.com/microsoft/TypeScript/issues/31535
 
-declare var TextDecoder: typeof import('util').TextDecoder;
-declare var TextEncoder: typeof import('util').TextEncoder;
+declare let TextDecoder: typeof import('util').TextDecoder;
+declare let TextEncoder: typeof import('util').TextEncoder;