Skip to content

Commit

Permalink
Updates GL+ content
Browse files Browse the repository at this point in the history
  • Loading branch information
@eamodio
eamodio committed Oct 15, 2022
1 parent f230780 commit b579d68
Show file tree
Hide file tree
Showing 14 changed files with 126 additions and 90 deletions.
24 changes: 17 additions & 7 deletions README.md
View file
Expand Up @@ -69,23 +69,27 @@ Here are just some of the **features** that GitLens provides,
- user-defined [**modes**](#modes- 'Jump to Modes') for quickly toggling between sets of settings
- and so much more 😁

# GitLens+ [#](#gitlens+- 'GitLens+')
# GitLens+ Features [#](#gitlens+-features- 'GitLens+ Features')

GitLens+ adds all-new, completely optional, features that enhance your current GitLens experience when you sign in with a free account. [GitLens+ features](https://gitkraken.com/gitlens/plus-features?utm_source=gitlens-extension&utm_medium=in-app-links&utm_campaign=gitlens-plus-links) are free for local and public repos, no account required, while private repos require GitLens Pro.
Powerful, all-new, and completely optional, features that enhance your GitLens experience.

> All other GitLens features are always accessible, without an account, and will continue to evolve and be invested in.
[GitLens+ features](https://gitkraken.com/gitlens/plus-features?utm_source=gitlens-extension&utm_medium=in-app-links&utm_campaign=gitlens-plus-links) are free for local and public repos, no account required, while upgrading to GitLens Pro gives you access on private repos.

> All other GitLens features are always accessible.
## Does this affect existing features?

No, the introduction of GitLens+ has no impact on existing GitLens features, so you won't lose access to any of the GitLens features you know and love. In fact, we are heavily investing in enhancing and expanding the GitLens feature set. Upgrading to GitLens Pro additionally gives you access to GitLens+ features on private repos.
No, the introduction of GitLens+ features has no impact on existing GitLens features, so you won't lose access to any of the GitLens features you know and love. In fact, we are heavily investing in enhancing and expanding the GitLens feature set. Additionally, GitLens+ features are freely available to everyone for local and public repos, while upgrading to GitLens Pro gives you access on private repos.

## Commit Graph [#](#commit-graph- 'Commit Graph')

<p align="center">
<img src="https://raw.githubusercontent.com/gitkraken/vscode-gitlens/main/images/docs/commit-graph-illustrated.png" alt="Commit Graph" />
</p>

The _Commit Graph_ helps you to easily visualize branch structure and commit history. Not only does it help you verify your changes, but also easily see changes made by others and when. Selecting a row within the graph will open in-depth information about a commit or stash in the new [Commit Details view](#commit-details-view-).
The _Commit Graph_ helps you easily visualize and keep track of all work in progress. Not only does it help you verify your changes, but also easily see changes made by others and when. Selecting a row within the graph will open in-depth information about a commit or stash in the new [Commit Details view](#commit-details-view-).

Use the rich commit search to find exactly what your looking for. It's powerful filters allow you to search by a specific commit, message, author, a changed file or files, or even a specific code change.

## Visual File History view [#](#visual-file-history-view- 'Visual File History view')

Expand All @@ -95,6 +99,8 @@ The _Commit Graph_ helps you to easily visualize branch structure and commit his

The _Visual File History_ view allows you to quickly see the evolution of a file, including when changes were made, how large they were, and who made them.

Use it to quickly find when the most impactful changes were made to a file or who best to talk to about file changes, and more.

Authors who have contributed changes to the file are on the left y-axis to create a swim-lane of their commits over time (the x-axis). Commit are plotted as color-coded (per-author) bubbles, whose size represents the relative magnitude of the changes.

Additionally, each commit's additions and deletions are visualized as color-coded, stacked, vertical bars, whose height represents the number of affected lines (right y-axis). Added lines are shown in green, while deleted lines are red.
Expand All @@ -105,7 +111,11 @@ Additionally, each commit's additions and deletions are visualized as color-code
<img src="https://raw.githubusercontent.com/gitkraken/vscode-gitlens/main/images/docs/worktrees-illustrated.png" alt="Worktrees view" />
</p>

Worktrees allow you to easily work on different branches of a repository simultaneously. You can create multiple working trees, each of which can be opened in individual windows or all together in a single workspace.
Worktrees help you multitask, by minimizing the context switching between branches, allowing you to easily work on different branches of a repository simultaneously.

Avoid interrupting your work in progress when needing to review a pull request. Simply create a new worktree and open it in a new VS Code window, all without impacting your other work.

You can create multiple working trees, each of which can be opened in individual windows or all together in a single workspace.

# Features

Expand Down Expand Up @@ -292,7 +302,7 @@ GitLens adds many side bar views to provide additional rich functionality. The d
<img src="https://raw.githubusercontent.com/gitkraken/vscode-gitlens/main/images/docs/commit-details-view.png" alt="Commits Details view" />
</p>

The _Commit Details_ view provides rich details for commits and stashes: author, commit ID, links to Pull Requests and Issues, autolinks, changed files, and more.
The _Commit Details_ view provides rich details for commits and stashes: author, commit ID, autolinks to pull requests and issues, changed files, and more.

These will show contextually as you navigate:

Expand Down
51 changes: 30 additions & 21 deletions package.json
View file
Expand Up @@ -12424,8 +12424,8 @@
},
{
"id": "gitlens.welcome.plus",
"title": "Introducing GitLens+",
"description": "Check out the all-new, completely optional, GitLens+ features.\n\n[Learn about GitLens+ features](command:gitlens.plus.learn?false \"Open the GitLens+ features walkthrough\")",
"title": "Introducing GitLens+ Features",
"description": "Check out the powerfull, all-new, and completely optional, GitLens+ features.\n\n[Learn about GitLens+ features](command:gitlens.plus.learn?false \"Open the GitLens+ features walkthrough\")",
"media": {
"markdown": "walkthroughs/getting-started/12-plus.md"
}
Expand All @@ -12434,50 +12434,50 @@
},
{
"id": "gitlens.plus",
"title": "Introducing GitLens+",
"title": "Introducing GitLens+ Features",
"description": "Get even more out of GitLens in VS Code!",
"steps": [
{
"id": "gitlens.plus.intro.tryNow",
"title": "Introducing GitLens+",
"title": "Introducing GitLens+ Features",
"description": "Try GitLens+ features on private repos, free for 3 days, without an account.\n\n[Start a GitLens Pro Trial](command:gitlens.plus.startPreviewTrial)",
"media": {
"markdown": "walkthroughs/plus/1-intro.md"
"markdown": "walkthroughs/plus/intro.md"
},
"when": "gitlens:plus:state == 0"
},
{
"id": "gitlens.plus.intro.trial",
"title": "Introducing GitLens+",
"title": "Introducing GitLens+ Features",
"description": "During your GitLens Pro trial, you have additional access to GitLens+ features on private repos.",
"media": {
"markdown": "walkthroughs/plus/1-intro.md"
"markdown": "walkthroughs/plus/intro.md"
},
"when": "gitlens:plus:state == 1 || gitlens:plus:state == 3"
},
{
"id": "gitlens.plus.intro.extend",
"title": "Introducing GitLens+",
"title": "Introducing GitLens+ Features",
"description": "Do you want to continue to use GitLens+ features on private repos, free for an additional 7-days?\n\n[Extend Trial](command:gitlens.plus.loginOrSignUp)",
"media": {
"markdown": "walkthroughs/plus/1-intro.md"
"markdown": "walkthroughs/plus/intro.md"
},
"when": "gitlens:plus:state == 2"
},
{
"id": "gitlens.plus.intro.signIn",
"title": "Introducing GitLens+",
"title": "Introducing GitLens+ Features",
"description": "Do you want to continue to use GitLens+ features on private repos?\n\n[Upgrade to Pro](command:gitlens.plus.command:gitlens.plus.purchase)",
"media": {
"markdown": "walkthroughs/plus/1-intro.md"
"markdown": "walkthroughs/plus/intro.md"
},
"when": "gitlens:plus:state == 4"
},
{
"id": "gitlens.plus.intro",
"title": "Introducing GitLens+",
"title": "Introducing GitLens+ Features",
"media": {
"markdown": "walkthroughs/plus/1-intro.md"
"markdown": "walkthroughs/plus/intro.md"
},
"when": "gitlens:plus:state == 5"
},
Expand All @@ -12494,15 +12494,15 @@
"title": "Visualize file history",
"description": "A more visual way to analyze and explore changes made to a file.\n\n[Open Visual File History view](command:gitlens.showTimelineView)",
"media": {
"markdown": "walkthroughs/plus/3-visual-file-history.md"
"markdown": "walkthroughs/plus/visual-file-history.md"
}
},
{
"id": "gitlens.plus.worktrees",
"title": "Worktrees",
"description": "Create worktrees to have multiple branches checked-out at once on the same repository.\n\n[Open Worktrees view](command:gitlens.showWorktreesView)",
"media": {
"markdown": "walkthroughs/plus/2-worktrees.md"
"markdown": "walkthroughs/plus/worktrees.md"
}
},
{
Expand All @@ -12517,25 +12517,34 @@
"title": "Try GitLens Pro",
"description": "Try GitLens+ features on private repos, free for 3 days, without an account.\n\n[Start a GitLens Pro Trial](command:gitlens.plus.startPreviewTrial)",
"media": {
"markdown": "walkthroughs/plus/5-try-now.md"
"markdown": "walkthroughs/plus/try-now.md"
},
"when": "gitlens:plus:state == 0"
},
{
"id": "gitlens.plus.extend",
"title": "Extend Your GitLens Pro Trial",
"description": "Sign in for use on public repos and get an additional 7 day trial for private repos.\n\n[Extend Trial](command:gitlens.plus.loginOrSignUp)",
"description": "Extend your trial to get an additional 7-days of GitLens+ features on private repos for free.\n\n[Extend Trial](command:gitlens.plus.loginOrSignUp)",
"media": {
"markdown": "walkthroughs/plus/5-try-now.md"
"markdown": "walkthroughs/plus/try-now.md"
},
"when": "gitlens:plus:state == 2"
},
{
"id": "gitlens.plus.signIn",
"id": "gitlens.plus.purchase",
"title": "Upgrade to GitLens Pro",
"description": "Do you want to continue to use GitLens+ features on private repos?\n\n[Upgrade to Pro](command:gitlens.plus.purchase)",
"description": "Want to use GitLens+ features on private repos?\n\n[Upgrade to Pro](command:gitlens.plus.purchase)",
"media": {
"markdown": "walkthroughs/plus/5-try-now.md"
"markdown": "walkthroughs/plus/try-now.md"
},
"when": "gitlens:plus:state == 1 || gitlens:plus:state == 3"
},
{
"id": "gitlens.plus.expired",
"title": "Upgrade to GitLens Pro",
"description": "Want to continue to use GitLens+ features on private repos?\n\n[Upgrade to Pro](command:gitlens.plus.purchase)",
"media": {
"markdown": "walkthroughs/plus/try-now.md"
},
"when": "gitlens:plus:state == 4"
}
Expand Down
29 changes: 14 additions & 15 deletions src/webviews/apps/home/components/header-card.ts
View file
Expand Up @@ -6,12 +6,9 @@ import '../../shared/components/codicon';

const template = html<HeaderCard>`
<div class="header-card__media"><img class="header-card__image" src="${x => x.image}" alt="GitLens Logo" /></div>
<h1 class="header-card__title">
${when(
x => x.name === '',
html<HeaderCard>`<span class="foreground">Git</span>Lens 13 <em>Git supercharged</em>`,
)}
${when(x => x.name !== '', html<HeaderCard>`<span class="foreground">${x => x.name}</span>`)}
<h1 class="header-card__title${x => (x.name === '' ? ' logo' : '')}">
${when(x => x.name === '', html<HeaderCard>`Git<span class="brand">Lens</span> 13`)}
${when(x => x.name !== '', html<HeaderCard>`${x => x.name}`)}
</h1>
<p class="header-card__account">
<span
Expand Down Expand Up @@ -124,6 +121,8 @@ const styles = css`
.header-card__media {
grid-column: 1;
grid-row: 1 / span 2;
display: flex;
align-items: center;
}
.header-card__image {
Expand All @@ -134,15 +133,15 @@ const styles = css`
.header-card__title {
font-size: var(--vscode-font-size);
color: var(--gitlens-brand-color-2);
font-weight: 600;
margin: 0;
}
.header-card__title em {
font-weight: normal;
color: var(--color-view-foreground);
opacity: 0.4;
margin-left: 0.4rem;
.header-card__title.logo {
font-family: 'Segoe UI Semibold', var(--font-family);
font-size: 1.5rem;
}
.header-card__account {
margin: 0;
display: flex;
Expand Down Expand Up @@ -181,11 +180,11 @@ const styles = css`
border-bottom-right-radius: 0.4rem;
}
.foreground {
color: var(--color-foreground);
.brand {
color: var(--gitlens-brand-color-2);
}
.status {
color: var(--color-foreground--75);
color: var(--color-foreground--65);
}
.repo-access {
Expand Down
10 changes: 5 additions & 5 deletions src/webviews/apps/home/components/plus-content.ts
View file
Expand Up @@ -8,15 +8,15 @@ const template = html<PlusContent>`
${when(
x => x.state === SubscriptionState.Free,
html<PlusContent>`
<p>All-new, completely optional, features that enhance your GitLens experience.</p>
<p>Powerful, all-new, and completely optional, features that enhance your GitLens experience.</p>
<p>
GitLens+ features are free for local and public repos, no account required, while private repos require
GitLens Pro.
GitLens+ features are free for local and public repos, no account required, while upgrading to GitLens
Pro gives you access on private repos.
</p>
<p class="mb-1">
<vscode-button @click="${x => x.fireAction('command:gitlens.plus.startPreviewTrial')}"
>Try GitLens Pro for private repos</vscode-button
>Try GitLens+ features on private repos</vscode-button
>
</p>
<p class="mb-1">
Expand Down Expand Up @@ -55,7 +55,7 @@ const template = html<PlusContent>`
You have ${x => x.daysRemaining} left in your
<a title="Learn more about GitLens+ features" href="command:gitlens.plus.learn">GitLens Pro trial</a>.
Once your trial ends, you'll continue to have access to GitLens+ features on local and public repos,
while private repos require GitLens Pro.
while upgrading to GitLens Pro gives you access on private repos.
</p>
`,
)}
Expand Down
26 changes: 14 additions & 12 deletions src/webviews/apps/home/home.html
View file
Expand Up @@ -120,7 +120,8 @@
<stepped-section id="features">
<span slot="heading">Features</span>
<p>
GitLens is deeply integrated into VS Code's Editors, Toolbars, Status Bar, and Command Palette.
GitLens is deeply integrated into many areas and aspects of VS Code, especially editors and
views.
</p>
<div class="activitybar-banner">
<ul>
Expand Down Expand Up @@ -242,7 +243,7 @@
<card-section dismissable id="commit-graph">
<span slot="heading">Introducing the Commit Graph</span>
<a
title="Learn more about the Visual File History"
title="Learn more about the Commit Graph"
href="command:gitlens.openWalkthrough?%22gitlens.plus%7Cgitlens.plus.commitGraph%22"
><img
src="#{webroot}/media/plus-commit-graph-illustrated.webp"
Expand All @@ -252,15 +253,16 @@
<p>
The
<a
title="Learn more about the Visual File History"
title="Learn more about the Commit Graph"
href="command:gitlens.openWalkthrough?%22gitlens.plus%7Cgitlens.plus.commitGraph%22"
>Commit Graph</a
>
helps you easily visualize and keep track of all work in progress.
</p>
<p class="mb-0">
Use our rich search to find exactly what your looking.It's powerful filters can search by a
specific commit, message, author, a changed file or files, or even a specific code change.
Use the rich commit search to find exactly what your looking for. It's powerful filters allow
you to search by a specific commit, message, author, a changed file or files, or even a specific
code change.
</p>
</card-section>
<card-section dismissable id="visual-file-history">
Expand All @@ -285,13 +287,13 @@
</p>
<p class="mb-0">
Use it to quickly find when the most impactful changes were made to a file or who best to talk
to about file changes (and more).
to about file changes, and more.
</p>
</card-section>
<card-section dismissable id="worktrees">
<span slot="heading">Introducing Worktrees</span>
<a
title="Learn more about worktrees"
title="Learn more about Worktrees"
href="command:gitlens.openWalkthrough?%22gitlens.plus%7Cgitlens.plus.worktrees%22"
><img
src="#{webroot}/media/plus-worktrees-illustrated.webp"
Expand All @@ -300,16 +302,16 @@
/></a>
<p>
<a
title="Learn more about worktrees"
title="Learn more about Worktrees"
href="command:gitlens.openWalkthrough?%22gitlens.plus%7Cgitlens.plus.worktrees%22"
>Worktrees</a
>
help you multitask quickly by allowing you to easily work on different branches of a repository
simultaneously.
help you multitask, by minimizing the context switching between branches, allowing you to easily
work on different branches of a repository simultaneously.
</p>
<p class="mb-0">
Avoid interrupting your work in progress when needing to checkout a PR. Simply create a worktree
and have both simultaneously.
Avoid interrupting your work in progress when needing to review a pull request. Simply create a
new worktree and open it in a new VS Code window, all without impacting your other work
</p>
</card-section>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/webviews/apps/plus/graph/GraphWrapper.tsx
View file
Expand Up @@ -620,7 +620,7 @@ export function GraphWrapper({
GitLens Pro trial
</a>
. Once your trial ends, you'll continue to have access to GitLens+ features on local and
public repos, while private repos require GitLens Pro.
public repos, while upgrading to GitLens Pro gives you access on private repos.
</p>
</>
);
Expand Down
8 changes: 7 additions & 1 deletion walkthroughs/getting-started/12-plus.md
View file
@@ -1,6 +1,12 @@
## GitLens+ Features

GitLens+ adds all-new, completely optional, features that enhance your current GitLens experience. These features are free for local and public repos, no account required.
Powerful, all-new, and completely optional, features that enhance your GitLens experience.

[GitLens+ features](https://gitkraken.com/gitlens/plus-features?utm_source=gitlens-extension&utm_medium=in-app-links&utm_campaign=gitlens-plus-links) are free for local and public repos, no account required, while upgrading to GitLens Pro gives you access on private repos.

[Learn more about GitLens+ features](https://gitkraken.com/gitlens/plus-features?utm_source=gitlens-extension&utm_medium=in-app-links&utm_campaign=gitlens-plus-links 'Learn more')

<span class="codicon codicon-info">All other GitLens features are always accessible</span>

GitLens+ features include the Commit Graph, Visual File History, Worktrees, and more.

Expand Down

0 comments on commit b579d68

Please sign in to comment.