From 9921a7458ad2f406a0700c08fc3ad9848ed44e5d Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Tue, 25 Aug 2020 01:44:33 -0400 Subject: [PATCH] Renames Compare w/ Remote to Compare w/ Upstream --- README.md | 2 +- package.json | 10 +++++----- src/views/viewCommands.ts | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 0b3e7c2..dbcc0e5 100644 --- a/README.md +++ b/README.md @@ -435,7 +435,7 @@ The compare view provides the following features, - **\* Files Changed** — lists all of the files changed between the compared revisions - Expands to a file-based view of all changed files in the working tree ([optionally](#compare-view-settings- 'Jump to the Compare view settings')) and/or all files in all commits ahead of the upstream - Results can be provided by the following commands - - _Compare with Remote_ command (`gitlens.views.compareWithRemote`) + - _Compare with Upstream_ command (`gitlens.views.compareWithUpstream`) - _Compare with HEAD_ command (`gitlens.views.compareWithHead`) - _Compare with Working Tree_ command (`gitlens.views.compareWithWorking`) - _Compare with Selected_ command (`gitlens.views.compareWithSelected`) diff --git a/package.json b/package.json index 548117e..64e090d 100644 --- a/package.json +++ b/package.json @@ -2930,8 +2930,8 @@ "icon": "$(compare-changes)" }, { - "command": "gitlens.views.compareWithRemote", - "title": "Compare with Remote", + "command": "gitlens.views.compareWithUpstream", + "title": "Compare with Upstream", "category": "GitLens", "icon": { "dark": "images/dark/icon-compare-ref-remote.svg", @@ -3949,7 +3949,7 @@ "when": "false" }, { - "command": "gitlens.views.compareWithRemote", + "command": "gitlens.views.compareWithUpstream", "when": "false" }, { @@ -4935,7 +4935,7 @@ "group": "inline@10" }, { - "command": "gitlens.views.compareWithRemote", + "command": "gitlens.views.compareWithUpstream", "when": "viewItem =~ /gitlens:branch\\b(?=.*?\\b\\+tracking\\b)/", "group": "inline@97" }, @@ -5011,7 +5011,7 @@ "group": "2_gitlens_quickopen@2" }, { - "command": "gitlens.views.compareWithRemote", + "command": "gitlens.views.compareWithUpstream", "when": "viewItem =~ /gitlens:branch\\b(?=.*?\\b\\+tracking\\b)/", "group": "4_gitlens_compare@1" }, diff --git a/src/views/viewCommands.ts b/src/views/viewCommands.ts index 535bea8..f5e77a9 100644 --- a/src/views/viewCommands.ts +++ b/src/views/viewCommands.ts @@ -143,7 +143,7 @@ export class ViewCommands { commands.registerCommand('gitlens.views.compareAncestryWithWorking', this.compareAncestryWithWorking, this); commands.registerCommand('gitlens.views.compareWithHead', this.compareWithHead, this); - commands.registerCommand('gitlens.views.compareWithRemote', this.compareWithRemote, this); + commands.registerCommand('gitlens.views.compareWithUpstream', this.compareWithUpstream, this); commands.registerCommand('gitlens.views.compareWithSelected', this.compareWithSelected, this); commands.registerCommand('gitlens.views.selectForCompare', this.selectForCompare, this); commands.registerCommand('gitlens.views.compareFileWithSelected', this.compareFileWithSelected, this); @@ -507,7 +507,7 @@ export class ViewCommands { } @debug() - private compareWithRemote(node: BranchNode) { + private compareWithUpstream(node: BranchNode) { if (!(node instanceof BranchNode)) return Promise.resolve(); if (!node.branch.tracking) return Promise.resolve();