Browse Source

Fixes my inability to spell comparison

main
Eric Amodio 6 years ago
parent
commit
347a8be75c
5 changed files with 27 additions and 27 deletions
  1. +3
    -3
      CHANGELOG.md
  2. +2
    -2
      README.md
  3. +15
    -15
      package.json
  4. +1
    -1
      src/ui/welcome/index.html
  5. +6
    -6
      src/views/compareView.ts

+ 3
- 3
CHANGELOG.md View File

@ -202,7 +202,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
- Adds a _Show Commit in View_ (`gitlens.showCommitInView`) command to quickly open the current line's commit in the _Search Commits_ view
- Adds a _Show Revision Details_ (`gitlens.showQuickRevisionDetails`) command to quickly show the revision (commit) details of the current file revision
- Adds the _Open Changes with Working File_ (`gitlens.diffWithWorking`) command to the editor toolbar when comparing revisions
- Adds comparisions to commit ids, by prefixing with a `#`, in addition to branches and tags — closes [#535](https://github.com/eamodio/vscode-gitlens/issues/535)
- Adds comparisons to commit ids, by prefixing with a `#`, in addition to branches and tags — closes [#535](https://github.com/eamodio/vscode-gitlens/issues/535)
- Adds support for git mailmap — closes [#388](https://github.com/eamodio/vscode-gitlens/issues/388)
- Adds support for Azure DevOps (formerly VSTS) remotes — closes [#501](https://github.com/eamodio/vscode-gitlens/issues/501)
- Adds better detection of on-prem BitBucket and GitLab remotes — closes [#214](https://github.com/eamodio/vscode-gitlens/issues/214)
@ -549,7 +549,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
### Changed
- Marks temporary files (used when showing comparisions with previous revisions) as read-only to help avoid accidental edits/saving
- Marks temporary files (used when showing comparisons with previous revisions) as read-only to help avoid accidental edits/saving
### Fixed
@ -673,7 +673,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
- Adds `gitlens.statusBar.reduceFlicker` setting to specify whether to reduce the status bar "flickering" when changing lines by not first clearing the previous blame information — closes [#272](https://github.com/eamodio/vscode-gitlens/issues/272)
- Adds the _Open File_ (`gitlens.explorers.openFile`) command to the _GitLens_ explorer's inline toolbar for file nodes
- Adds the _Clear Results_ (`gitlen.resultsExplorer.clearResultsNode`) command to the _GitLens Results_ explorer's inline toolbar for results nodes
- Adds the _Swap Comparision_ (`gitlen.resultsExplorer.swapComparision`) command to the _GitLens Results_ explorer's inline toolbar and context menu for comparision results nodes
- Adds the _Swap Comparison_ (`gitlen.resultsExplorer.swapComparison`) command to the _GitLens Results_ explorer's inline toolbar and context menu for comparison results nodes
- Adds _Push to Commit (via Terminal)_ (`gitlens.explorers.terminalPushCommit`) command to commit nodes on the current branch in the _GitLens_ explorer
## Changed

+ 2
- 2
README.md View File

@ -455,8 +455,8 @@ A [customizable](#compare-view-settings- 'Jump to the Compare view settings') vi
The compare view provides the following features,
- Provides a semi-persistent results view for comparison operations
- An inline toolbar provides quick access to the _Swap Comparision_, and _Dismiss_ commands
- A context menu provides access to common comparision commands
- An inline toolbar provides quick access to the _Swap Comparison_, and _Dismiss_ commands
- A context menu provides access to common comparison commands
- **\* Commits** — lists the commits between the compared revisions (branches or commits)
- Expands to provide the message, author, date, and change indicator of each revision (commit) — fully [customizable](#view-settings- 'Jump to the View settings')
- Each revision (commit) expands to list its set of changed files, complete with status indicators for adds, changes, renames, and deletes

+ 15
- 15
package.json View File

@ -2703,8 +2703,8 @@
}
},
{
"command": "gitlens.views.compare.pinComparision",
"title": "Pin Comparision",
"command": "gitlens.views.compare.pinComparison",
"title": "Pin Comparison",
"category": "GitLens",
"icon": {
"dark": "images/dark/icon-pin.svg",
@ -2712,8 +2712,8 @@
}
},
{
"command": "gitlens.views.compare.unpinComparision",
"title": "Unpin Comparision",
"command": "gitlens.views.compare.unpinComparison",
"title": "Unpin Comparison",
"category": "GitLens",
"icon": {
"dark": "images/dark/icon-pinned.svg",
@ -2721,8 +2721,8 @@
}
},
{
"command": "gitlens.views.compare.swapComparision",
"title": "Swap Comparision",
"command": "gitlens.views.compare.swapComparison",
"title": "Swap Comparison",
"category": "GitLens",
"icon": {
"dark": "images/dark/icon-swap.svg",
@ -3368,15 +3368,15 @@
"when": "false"
},
{
"command": "gitlens.views.compare.pinComparision",
"command": "gitlens.views.compare.pinComparison",
"when": "false"
},
{
"command": "gitlens.views.compare.unpinComparision",
"command": "gitlens.views.compare.unpinComparison",
"when": "false"
},
{
"command": "gitlens.views.compare.swapComparision",
"command": "gitlens.views.compare.swapComparison",
"when": "false"
},
{
@ -4403,17 +4403,17 @@
"group": "1_gitlens@1"
},
{
"command": "gitlens.views.compare.swapComparision",
"command": "gitlens.views.compare.swapComparison",
"when": "viewItem =~ /gitlens:compare:results\b/",
"group": "inline@1"
},
{
"command": "gitlens.views.compare.pinComparision",
"command": "gitlens.views.compare.pinComparison",
"when": "viewItem =~ /gitlens:compare:results\b(?!.*?\+pinned\b.*?)/",
"group": "inline@2"
},
{
"command": "gitlens.views.compare.unpinComparision",
"command": "gitlens.views.compare.unpinComparison",
"when": "viewItem =~ /gitlens:compare:results\b.*?\+pinned\b.*?/",
"group": "inline@2"
},
@ -4423,17 +4423,17 @@
"group": "inline@3"
},
{
"command": "gitlens.views.compare.swapComparision",
"command": "gitlens.views.compare.swapComparison",
"when": "viewItem =~ /gitlens:compare:results\b/",
"group": "2_gitlens@1"
},
{
"command": "gitlens.views.compare.pinComparision",
"command": "gitlens.views.compare.pinComparison",
"when": "viewItem =~ /gitlens:compare:results\b(?!.*?\+pinned\b.*?)/",
"group": "3_gitlens@1"
},
{
"command": "gitlens.views.compare.unpinComparision",
"command": "gitlens.views.compare.unpinComparison",
"when": "viewItem =~ /gitlens:compare:results\b.*?\+pinned\b.*?/",
"group": "3_gitlens@1"
},

+ 1
- 1
src/ui/welcome/index.html View File

@ -679,7 +679,7 @@
<div class="changelog__details changelog__details--list"></div>
</li>
<li>
<span class="changelog__badge changelog__badge--added">NEW</span>Adds comparisions
<span class="changelog__badge changelog__badge--added">NEW</span>Adds comparisons
to commit ids, by prefixing with a <code>#</code>, in addition to branches and tags
&mdash; closes
<a

+ 6
- 6
src/views/compareView.ts View File

@ -54,9 +54,9 @@ export class CompareView extends ViewBase {
this
);
commands.registerCommand(this.getQualifiedCommand('pinComparision'), this.pinComparision, this);
commands.registerCommand(this.getQualifiedCommand('unpinComparision'), this.unpinComparision, this);
commands.registerCommand(this.getQualifiedCommand('swapComparision'), this.swapComparision, this);
commands.registerCommand(this.getQualifiedCommand('pinComparison'), this.pinComparison, this);
commands.registerCommand(this.getQualifiedCommand('unpinComparison'), this.unpinComparison, this);
commands.registerCommand(this.getQualifiedCommand('swapComparison'), this.swapComparison, this);
commands.registerCommand(this.getQualifiedCommand('selectForCompare'), this.selectForCompare, this);
commands.registerCommand(this.getQualifiedCommand('compareWithSelected'), this.compareWithSelected, this);
@ -170,19 +170,19 @@ export class CompareView extends ViewBase {
setCommandContext(CommandContext.ViewsCompareKeepResults, enabled);
}
private async pinComparision(node: ViewNode) {
private async pinComparison(node: ViewNode) {
if (!(node instanceof CompareResultsNode)) return;
return node.pin();
}
private swapComparision(node: ViewNode) {
private swapComparison(node: ViewNode) {
if (!(node instanceof CompareResultsNode)) return;
return node.swap();
}
private async unpinComparision(node: ViewNode) {
private async unpinComparison(node: ViewNode) {
if (!(node instanceof CompareResultsNode)) return;
return node.unpin();

||||||
x
 
000:0
Loading…
Cancel
Save