From 2d583c83d12330b466e4e297bebebdcce63c2af8 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sun, 11 Nov 2018 00:48:00 -0500 Subject: [PATCH] Uses compare with vs compare to --- src/commands/diffBranchWithBranch.ts | 6 +++--- src/commands/diffDirectory.ts | 2 +- src/views/nodes/compareNode.ts | 4 ++-- src/views/nodes/comparePickerNode.ts | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/commands/diffBranchWithBranch.ts b/src/commands/diffBranchWithBranch.ts index 2e10c39..1d3d14f 100644 --- a/src/commands/diffBranchWithBranch.ts +++ b/src/commands/diffBranchWithBranch.ts @@ -56,13 +56,13 @@ export class DiffBranchWithBranchCommand extends ActiveEditorCommand { let placeHolder; switch (args.ref2) { case '': - placeHolder = `Compare Working Tree to${GlyphChars.Ellipsis}`; + placeHolder = `Compare Working Tree with${GlyphChars.Ellipsis}`; break; case 'HEAD': - placeHolder = `Compare HEAD to${GlyphChars.Ellipsis}`; + placeHolder = `Compare HEAD with${GlyphChars.Ellipsis}`; break; default: - placeHolder = `Compare ${args.ref2} to${GlyphChars.Ellipsis}`; + placeHolder = `Compare ${args.ref2} with${GlyphChars.Ellipsis}`; break; } diff --git a/src/commands/diffDirectory.ts b/src/commands/diffDirectory.ts index 7a43ee6..aaff77c 100644 --- a/src/commands/diffDirectory.ts +++ b/src/commands/diffDirectory.ts @@ -62,7 +62,7 @@ export class DiffDirectoryCommand extends ActiveEditorCommand { args = { ...args }; const pick = await new BranchesAndTagsQuickPick(repoPath).show( - `Compare Working Tree to${GlyphChars.Ellipsis}` + `Compare Working Tree with${GlyphChars.Ellipsis}` ); if (pick === undefined) return undefined; diff --git a/src/views/nodes/compareNode.ts b/src/views/nodes/compareNode.ts index e8b3a72..6be5760 100644 --- a/src/views/nodes/compareNode.ts +++ b/src/views/nodes/compareNode.ts @@ -124,7 +124,7 @@ export class CompareNode extends ViewNode { if (ref === undefined) { const pick = await new BranchesAndTagsQuickPick(repoPath).show( - `Compare ${this.getRefName(this._selectedRef.ref)} to${GlyphChars.Ellipsis}` + `Compare ${this.getRefName(this._selectedRef.ref)} with${GlyphChars.Ellipsis}` ); if (pick === undefined || pick instanceof CommandQuickPickItem) return; @@ -143,7 +143,7 @@ export class CompareNode extends ViewNode { if (repoPath === undefined) { repoPath = await getRepoPathOrPrompt( undefined, - `Select branch or tag in which repository${GlyphChars.Ellipsis}` + `Select branch or tag for compare in which repository${GlyphChars.Ellipsis}` ); } if (repoPath === undefined) return; diff --git a/src/views/nodes/comparePickerNode.ts b/src/views/nodes/comparePickerNode.ts index 559204d..98c4fce 100644 --- a/src/views/nodes/comparePickerNode.ts +++ b/src/views/nodes/comparePickerNode.ts @@ -34,7 +34,7 @@ export class ComparePickerNode extends ViewNode { let item; if (selectedRef === undefined) { item = new TreeItem( - `Compare <branch, tag, or ref> to <branch, tag, or ref>${repository}`, + `Compare <branch, tag, or ref> with <branch, tag, or ref>${repository}`, TreeItemCollapsibleState.None ); item.contextValue = ResourceType.ComparePicker; @@ -46,11 +46,11 @@ export class ComparePickerNode extends ViewNode { } else { item = new TreeItem( - `Compare ${selectedRef.label} to <branch, tag, or ref>${repository}`, + `Compare ${selectedRef.label} with <branch, tag, or ref>${repository}`, TreeItemCollapsibleState.None ); item.contextValue = ResourceType.ComparePickerWithRef; - item.tooltip = `Click to compare ${selectedRef.label} to${GlyphChars.Ellipsis}`; + item.tooltip = `Click to compare ${selectedRef.label} with${GlyphChars.Ellipsis}`; item.command = { title: `Compare ${selectedRef.label} with${GlyphChars.Ellipsis}`, command: this.view.getQualifiedCommand('compareWithSelected')