Browse Source

Fixes typos

main
Eric Amodio 6 years ago
parent
commit
cd7a9ced38
9 changed files with 75 additions and 75 deletions
  1. +1
    -1
      CHANGELOG.md
  2. +5
    -5
      README.md
  3. +2
    -2
      src/commands/diffDirectory.ts
  4. +1
    -1
      src/ui/settings/index.html
  5. +2
    -2
      src/ui/welcome/index.html
  6. +1
    -1
      src/views/comparisonResultsNode.ts
  7. +1
    -1
      src/views/explorerNodes.ts
  8. +2
    -2
      src/views/resultsExplorer.ts

+ 1
- 1
CHANGELOG.md View File

@ -225,7 +225,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
- Adds `gitlens.resultsExplorer.gravatars` setting to specify whether or not to show gravatar images instead of commit (or status) icons in the **GitLens Results** view - Adds `gitlens.resultsExplorer.gravatars` setting to specify whether or not to show gravatar images instead of commit (or status) icons in the **GitLens Results** view
- Adds `gitlens.resultsExplorer.gravatarsDefault` setting to specify the style of the gravatar default (fallback) images in the **GitLens Results** view<br />`identicon` - a geometric pattern<br />`mm` - (mystery-man) a simple, cartoon-style silhouetted outline of a person (does not vary by email hash)<br />`monsterid` - a monster with different colors, faces, etc<br />`retro` - 8-bit arcade-style pixelated faces<br />`robohash` - a robot with different colors, faces, etc<br />`wavatar` - faces with differing features and backgrounds - Adds `gitlens.resultsExplorer.gravatarsDefault` setting to specify the style of the gravatar default (fallback) images in the **GitLens Results** view<br />`identicon` - a geometric pattern<br />`mm` - (mystery-man) a simple, cartoon-style silhouetted outline of a person (does not vary by email hash)<br />`monsterid` - a monster with different colors, faces, etc<br />`retro` - 8-bit arcade-style pixelated faces<br />`robohash` - a robot with different colors, faces, etc<br />`wavatar` - faces with differing features and backgrounds
- Adds *Select for Compare* command (`gitlens.explorers.selectForCompare`) to branch, remote branch, tag, and revision (commit) nodes in the **GitLens** view to mark the base reference of a comparision
- Adds *Select for Compare* command (`gitlens.explorers.selectForCompare`) to branch, remote branch, tag, and revision (commit) nodes in the **GitLens** view to mark the base reference of a comparison
- Adds *Compare with Selected* command (`gitlens.explorers.compareWithSelected`) to branch, remote branch, tag, and revision (commit) nodes in the **GitLens** view once another reference within the same repository has been selected to compare the current selection with the previously selected reference in the **GitLens Results** view - Adds *Compare with Selected* command (`gitlens.explorers.compareWithSelected`) to branch, remote branch, tag, and revision (commit) nodes in the **GitLens** view once another reference within the same repository has been selected to compare the current selection with the previously selected reference in the **GitLens Results** view
- Adds an all-new, on-demand **GitLens Results** view to the Explorer activity - Adds an all-new, on-demand **GitLens Results** view to the Explorer activity

+ 5
- 5
README.md View File

@ -16,11 +16,11 @@
GitLens is a free, [open-source](https://github.com/eamodio/vscode-gitlens "Open GitLens on GitHub") extension for [Visual Studio Code](https://code.visualstudio.com) created by [Eric Amodio](http://amod.io "Learn more about Eric"). GitLens is a free, [open-source](https://github.com/eamodio/vscode-gitlens "Open GitLens on GitHub") extension for [Visual Studio Code](https://code.visualstudio.com) created by [Eric Amodio](http://amod.io "Learn more about Eric").
GitLens simply helps you understand code better. Quickly glimpse into who, why, and when a line or code block was changed. Jump back through history to gain further insights as to how and why the code evolved. Explore the history and evolution of a codebase.
GitLens simply helps you understand code better. Quickly glimpse into whom, why, and when a line or code block was changed. Jump back through history to gain further insights as to how and why the code evolved. Explore the history and evolution of a codebase.
Here are just some of the features that GitLens provides, Here are just some of the features that GitLens provides,
- a [*GitLens* explorer](#gitlens-explorer "Jump to the GitLens explorer") to navigate and explore repositories or file histories - a [*GitLens* explorer](#gitlens-explorer "Jump to the GitLens explorer") to navigate and explore repositories or file histories
- an on-demand [*GitLens Results* view](#gitlens-results-view "Jump to the GitLens Results view") to explore commit searches, visualize comparisions between branches, tags, commits, and more
- an on-demand [*GitLens Results* view](#gitlens-results-view "Jump to the GitLens Results view") to explore commit searches, visualize comparisons between branches, tags, commits, and more
- authorship [code lens](#code-lens "Jump to the Code Lens") showing the most recent commit and # of authors to the top of files and/or on code blocks - authorship [code lens](#code-lens "Jump to the Code Lens") showing the most recent commit and # of authors to the top of files and/or on code blocks
- an unobtrusive [current line blame](#current-line-blame "Jump to the Current Line Blame") annotation at the end of the line - an unobtrusive [current line blame](#current-line-blame "Jump to the Current Line Blame") annotation at the end of the line
- on-demand [gutter blame](#gutter-blame "Jump to the Gutter Blame") annotations, including a heatmap, for the whole file - on-demand [gutter blame](#gutter-blame "Jump to the Gutter Blame") annotations, including a heatmap, for the whole file
@ -65,7 +65,7 @@ The repository view provides a full Git repository explorer, which has the follo
- is behind the upstream &mdash; quickly see and explore the specific commits behind the upstream (i.e. commits that haven't been pulled) - is behind the upstream &mdash; quickly see and explore the specific commits behind the upstream (i.e. commits that haven't been pulled)
- is ahead of the upstream &mdash; quickly see and explore the specific commits ahead of the upstream (i.e. commits that haven't been pushed) - is ahead of the upstream &mdash; quickly see and explore the specific commits ahead of the upstream (i.e. commits that haven't been pushed)
- A context menu provides *Open Repository in Remote*, and *Refresh* commands - A context menu provides *Open Repository in Remote*, and *Refresh* commands
- **Changed Files** &mdash; lists all of the "working" changes
- **Changed Files** &mdash; lists all the "working" changes
- Expands to a file-based view of all changed files in the working tree ([optionally](#gitlens-explorer-settings "Jump to the GitLens explorer 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](#gitlens-explorer-settings "Jump to the GitLens explorer settings")) and/or all files in all commits ahead of the upstream
- **Branches** &mdash; lists the local branches - **Branches** &mdash; lists the local branches
@ -127,12 +127,12 @@ The history view provides the revision history of the active file, which has the
<img src="https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/ss-gitlens-results.png" alt="GitLens Results view" /> <img src="https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/ss-gitlens-results.png" alt="GitLens Results view" />
</p> </p>
An on-demand, [customizable](#gitlens-results-view-settings "Jump to the GitLens Results view settings") view to explore commits, histories, and searches, or visualize comparisions between branches, tags, commits, and more
An on-demand, [customizable](#gitlens-results-view-settings "Jump to the GitLens Results view settings") view to explore commits, histories, and searches, or visualize comparisons between branches, tags, commits, and more
- A toolbar provides *Search Commits*, *Keep Results*, and *Refresh* commands - A toolbar provides *Search Commits*, *Keep Results*, and *Refresh* commands
- A context menu provides *Automatic Layout*, *List Layout*, *Tree Layout*, and *Close* commands - A context menu provides *Automatic Layout*, *List Layout*, *Tree Layout*, and *Close* commands
#### Explore #### Explore
- Provides a semi-persistent results view for exploring histories, commits, and searchs
- Provides a semi-persistent results view for exploring histories, commits, and searches
- Accessible via the following commands - Accessible via the following commands
- *Show Commit Search* command (`gitlens.showCommitSearch`) - *Show Commit Search* command (`gitlens.showCommitSearch`)
- *Show File History* command (`gitlens.showQuickFileHistory`) - *Show File History* command (`gitlens.showQuickFileHistory`)

+ 2
- 2
src/commands/diffDirectory.ts View File

@ -4,7 +4,7 @@ import { ActiveEditorCommand, Commands, getCommandUri } from './common';
import { CommandContext, isCommandViewContextWithRef } from '../commands'; import { CommandContext, isCommandViewContextWithRef } from '../commands';
import { BuiltInCommands, GlyphChars } from '../constants'; import { BuiltInCommands, GlyphChars } from '../constants';
import { Container } from '../container'; import { Container } from '../container';
import { ComparisionResultsNode } from '../views/explorerNodes';
import { ComparisonResultsNode } from '../views/explorerNodes';
import { Logger } from '../logger'; import { Logger } from '../logger';
import { Messages } from '../messages'; import { Messages } from '../messages';
import { BranchesAndTagsQuickPick, CommandQuickPickItem } from '../quickPicks'; import { BranchesAndTagsQuickPick, CommandQuickPickItem } from '../quickPicks';
@ -28,7 +28,7 @@ export class DiffDirectoryCommand extends ActiveEditorCommand {
break; break;
case Commands.ExplorersOpenDirectoryDiff: case Commands.ExplorersOpenDirectoryDiff:
if (context.type === 'view' && context.node instanceof ComparisionResultsNode) {
if (context.type === 'view' && context.node instanceof ComparisonResultsNode) {
args.ref1 = context.node.ref1; args.ref1 = context.node.ref1;
args.ref2 = context.node.ref2; args.ref2 = context.node.ref2;
} }

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

@ -111,7 +111,7 @@
<i class="icon icon__info"></i> <i class="icon icon__info"></i>
</a> </a>
</h2> </h2>
<p class="section__title-hint">Adds an on-demand GitLens Results view to explore commits, histories, and searches, or visualize comparisions between branches, tags, commits, and more</p>
<p class="section__title-hint">Adds an on-demand GitLens Results view to explore commits, histories, and searches, or visualize comparisons between branches, tags, commits, and more</p>
</div> </div>
<div class="section__settings"> <div class="section__settings">
<div class="settings-group"> <div class="settings-group">

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

@ -59,14 +59,14 @@
href="http://amod.io/?utm_source=gitlens">Eric Amodio</a>. href="http://amod.io/?utm_source=gitlens">Eric Amodio</a>.
</p> </p>
<p> <p>
GitLens simply helps you understand code better. Quickly glimpse into who, why, and when a line or code block was changed.
GitLens simply helps you understand code better. Quickly glimpse into whom, why, and when a line or code block was changed.
Jump back through history to gain further insights as to how and why the code evolved. Explore Jump back through history to gain further insights as to how and why the code evolved. Explore
the history and evolution of a codebase. Dive right in and see how GitLens can help! the history and evolution of a codebase. Dive right in and see how GitLens can help!
</p> </p>
<p>Here are just some of the features that GitLens provides, <p>Here are just some of the features that GitLens provides,
<ul class="features-list"> <ul class="features-list">
<li>a <i>GitLens</i> explorer to navigate and explore repositories or file histories</li> <li>a <i>GitLens</i> explorer to navigate and explore repositories or file histories</li>
<li>an on-demand <i>GitLens Results</i> view to explore commits, histories, and searches, or visualize comparisions between branches, tags, commits, and more</li>
<li>an on-demand <i>GitLens Results</i> view to explore commits, histories, and searches, or visualize comparisons between branches, tags, commits, and more</li>
<li>authorship code lens showing the most recent commit and # of authors to the top of files and/or on code blocks</li> <li>authorship code lens showing the most recent commit and # of authors to the top of files and/or on code blocks</li>
<li>an unobtrusive current line blame annotation at the end of the line</li> <li>an unobtrusive current line blame annotation at the end of the line</li>
<li>on-demand gutter blame annotations, including a heatmap, for the whole file</li> <li>on-demand gutter blame annotations, including a heatmap, for the whole file</li>

src/views/comparisionResultsNode.ts → src/views/comparisonResultsNode.ts View File

@ -8,7 +8,7 @@ import { Explorer, ExplorerNode, ResourceType } from './explorerNode';
import { GitLog, GitService, GitStatusFile, GitUri } from '../gitService'; import { GitLog, GitService, GitStatusFile, GitUri } from '../gitService';
import { StatusFilesResultsNode } from './statusFilesResultsNode'; import { StatusFilesResultsNode } from './statusFilesResultsNode';
export class ComparisionResultsNode extends ExplorerNode {
export class ComparisonResultsNode extends ExplorerNode {
constructor( constructor(
repoPath: string, repoPath: string,

+ 1
- 1
src/views/explorerNodes.ts View File

@ -9,7 +9,7 @@ export * from './commitNode';
export * from './commitResultsNode'; export * from './commitResultsNode';
export * from './commitsNode'; export * from './commitsNode';
export * from './commitsResultsNode'; export * from './commitsResultsNode';
export * from './comparisionResultsNode';
export * from './comparisonResultsNode';
export * from './fileHistoryNode'; export * from './fileHistoryNode';
export * from './historyNode'; export * from './historyNode';
export * from './remoteNode'; export * from './remoteNode';

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

@ -5,7 +5,7 @@ import { configuration, ExplorerFilesLayout, IExplorersConfig, IResultsExplorerC
import { CommandContext, GlyphChars, setCommandContext, WorkspaceState } from '../constants'; import { CommandContext, GlyphChars, setCommandContext, WorkspaceState } from '../constants';
import { Container } from '../container'; import { Container } from '../container';
import { RefreshNodeCommandArgs } from './explorerCommands'; import { RefreshNodeCommandArgs } from './explorerCommands';
import { CommitResultsNode, CommitsResultsNode, ComparisionResultsNode, ExplorerNode, MessageNode, RefreshReason, ResourceType } from './explorerNodes';
import { CommitResultsNode, CommitsResultsNode, ComparisonResultsNode, ExplorerNode, MessageNode, RefreshReason, ResourceType } from './explorerNodes';
import { GitLog, GitLogCommit } from '../gitService'; import { GitLog, GitLogCommit } from '../gitService';
import { Logger } from '../logger'; import { Logger } from '../logger';
import { Messages } from '../messages'; import { Messages } from '../messages';
@ -125,7 +125,7 @@ export class ResultsExplorer extends Disposable implements TreeDataProvider
} }
showComparisonInResults(repoPath: string, ref1: string, ref2: string) { showComparisonInResults(repoPath: string, ref1: string, ref2: string) {
this.addResults(new ComparisionResultsNode(repoPath, ref1, ref2, this));
this.addResults(new ComparisonResultsNode(repoPath, ref1, ref2, this));
this.showResults(); this.showResults();
} }

Loading…
Cancel
Save