Browse Source

Renames Compare w/ Remote to Compare w/ Upstream

main
Eric Amodio 4 years ago
parent
commit
9921a7458a
3 changed files with 8 additions and 8 deletions
  1. +1
    -1
      README.md
  2. +5
    -5
      package.json
  3. +2
    -2
      src/views/viewCommands.ts

+ 1
- 1
README.md View File

@ -435,7 +435,7 @@ The compare view provides the following features,
- **\* Files Changed** — lists all of the files changed between the compared revisions - **\* 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 - 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 - 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 HEAD_ command (`gitlens.views.compareWithHead`)
- _Compare with Working Tree_ command (`gitlens.views.compareWithWorking`) - _Compare with Working Tree_ command (`gitlens.views.compareWithWorking`)
- _Compare with Selected_ command (`gitlens.views.compareWithSelected`) - _Compare with Selected_ command (`gitlens.views.compareWithSelected`)

+ 5
- 5
package.json View File

@ -2930,8 +2930,8 @@
"icon": "$(compare-changes)" "icon": "$(compare-changes)"
}, },
{ {
"command": "gitlens.views.compareWithRemote",
"title": "Compare with Remote",
"command": "gitlens.views.compareWithUpstream",
"title": "Compare with Upstream",
"category": "GitLens", "category": "GitLens",
"icon": { "icon": {
"dark": "images/dark/icon-compare-ref-remote.svg", "dark": "images/dark/icon-compare-ref-remote.svg",
@ -3949,7 +3949,7 @@
"when": "false" "when": "false"
}, },
{ {
"command": "gitlens.views.compareWithRemote",
"command": "gitlens.views.compareWithUpstream",
"when": "false" "when": "false"
}, },
{ {
@ -4935,7 +4935,7 @@
"group": "inline@10" "group": "inline@10"
}, },
{ {
"command": "gitlens.views.compareWithRemote",
"command": "gitlens.views.compareWithUpstream",
"when": "viewItem =~ /gitlens:branch\\b(?=.*?\\b\\+tracking\\b)/", "when": "viewItem =~ /gitlens:branch\\b(?=.*?\\b\\+tracking\\b)/",
"group": "inline@97" "group": "inline@97"
}, },
@ -5011,7 +5011,7 @@
"group": "2_gitlens_quickopen@2" "group": "2_gitlens_quickopen@2"
}, },
{ {
"command": "gitlens.views.compareWithRemote",
"command": "gitlens.views.compareWithUpstream",
"when": "viewItem =~ /gitlens:branch\\b(?=.*?\\b\\+tracking\\b)/", "when": "viewItem =~ /gitlens:branch\\b(?=.*?\\b\\+tracking\\b)/",
"group": "4_gitlens_compare@1" "group": "4_gitlens_compare@1"
}, },

+ 2
- 2
src/views/viewCommands.ts View File

@ -143,7 +143,7 @@ export class ViewCommands {
commands.registerCommand('gitlens.views.compareAncestryWithWorking', this.compareAncestryWithWorking, this); commands.registerCommand('gitlens.views.compareAncestryWithWorking', this.compareAncestryWithWorking, this);
commands.registerCommand('gitlens.views.compareWithHead', this.compareWithHead, 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.compareWithSelected', this.compareWithSelected, this);
commands.registerCommand('gitlens.views.selectForCompare', this.selectForCompare, this); commands.registerCommand('gitlens.views.selectForCompare', this.selectForCompare, this);
commands.registerCommand('gitlens.views.compareFileWithSelected', this.compareFileWithSelected, this); commands.registerCommand('gitlens.views.compareFileWithSelected', this.compareFileWithSelected, this);
@ -507,7 +507,7 @@ export class ViewCommands {
} }
@debug() @debug()
private compareWithRemote(node: BranchNode) {
private compareWithUpstream(node: BranchNode) {
if (!(node instanceof BranchNode)) return Promise.resolve(); if (!(node instanceof BranchNode)) return Promise.resolve();
if (!node.branch.tracking) return Promise.resolve(); if (!node.branch.tracking) return Promise.resolve();

Loading…
Cancel
Save