diff --git a/package.json b/package.json
index d4ce4114c9c47..dd7d6036cf087 100644
--- a/package.json
+++ b/package.json
@@ -3583,7 +3583,7 @@
},
{
"command": "gitlens.premium.purchase",
- "title": "Unlock Premium Features for Private Code...",
+ "title": "Unlock Premium Features for Private Repos...",
"category": "GitLens Premium"
},
{
@@ -10464,18 +10464,28 @@
},
{
"view": "gitlens.views.worktrees",
- "contents": "Worktrees are a premium feature, which require a free account for public code. [Learn more](https://dev.gitkraken.com/gitlens/premium-features).",
- "when": "gitlens:premium:upgradeRequired == free+"
+ "contents": "To use premium GitLens features, please verify the email for the account you created.\n\n[Resend verification email](command:gitlens.premium.resendVerification)",
+ "when": "gitlens:premium:requiresVerification"
},
{
"view": "gitlens.views.worktrees",
- "contents": "Worktrees are a premium feature, which require at least a Pro subscription for private code. [Learn more](https://dev.gitkraken.com/gitlens/premium-features).",
+ "contents": "Worktrees are a premium feature, which require a free account for public repos. [Learn more](https://dev.gitkraken.com/gitlens/premium-features).\n\nYou can try these premium features for free, without an account, for 3 days. All non-premium features will continue to be free without an account.",
+ "when": "gitlens:premium:upgradeRequired == free+ && !gitlens:premium:requiresVerification"
+ },
+ {
+ "view": "gitlens.views.worktrees",
+ "contents": "[Try premium features now](command:gitlens.premium.startPreview)\n\n[Create a free account](command:gitlens.premium.loginOrSignUp)",
+ "when": "gitlens:premium:upgradeRequired == free+ && !gitlens:premium:requiresVerification"
+ },
+ {
+ "view": "gitlens.views.worktrees",
+ "contents": "Worktrees are a premium feature, which require at least a Pro subscription for private repos. [Learn more](https://dev.gitkraken.com/gitlens/premium-features).",
"when": "gitlens:premium:upgradeRequired == paid"
},
{
"view": "gitlens.views.worktrees",
- "contents": "[Unlock Premium Features](command:gitlens.showHomeView)",
- "when": "gitlens:premium:upgradeRequired"
+ "contents": "[Upgrade your account](command:gitlens.premium.purchase)",
+ "when": "gitlens:premium:upgradeRequired == paid"
}
],
"views": {
diff --git a/src/commands/gitCommands.ts b/src/commands/gitCommands.ts
index 496bfed3f503c..f17221d6691c8 100644
--- a/src/commands/gitCommands.ts
+++ b/src/commands/gitCommands.ts
@@ -709,10 +709,23 @@ export class GitCommandsCommand extends Command {
void loadMore();
return;
+ case Directive.StartPreview:
+ void Container.instance.subscription.startPreview();
+ resolve(undefined);
+ return;
+
case Directive.RequiresVerification:
+ void Container.instance.subscription.resendVerification();
+ resolve(undefined);
+ return;
+
case Directive.RequiresFreeSubscription:
+ void Container.instance.subscription.loginOrSignUp();
+ resolve(undefined);
+ return;
+
case Directive.RequiresPaidSubscription:
- void Container.instance.subscription.showHomeView();
+ void Container.instance.subscription.purchase();
resolve(undefined);
return;
}
diff --git a/src/commands/quickCommand.steps.ts b/src/commands/quickCommand.steps.ts
index 19712daac6076..500b82caf9c77 100644
--- a/src/commands/quickCommand.steps.ts
+++ b/src/commands/quickCommand.steps.ts
@@ -2236,27 +2236,30 @@ export async function* ensureAccessStep<
const access = await Container.instance.git.access(feature, state.repo.path);
if (access.allowed) return undefined;
- let directive: Directive;
+ const directives: DirectiveQuickPickItem[] = [];
let placeholder: string;
if (access.subscription.current.account?.verified === false) {
- directive = Directive.RequiresVerification;
+ directives.push(DirectiveQuickPickItem.create(Directive.RequiresVerification, true));
placeholder = 'You must verify your account email address before you can continue';
} else {
if (access.subscription.required == null) return undefined;
if (isPaidSubscriptionPlan(access.subscription.required)) {
- directive = Directive.RequiresPaidSubscription;
- placeholder = 'Requires a paid subscription';
+ directives.push(DirectiveQuickPickItem.create(Directive.RequiresPaidSubscription, true));
+ placeholder = 'Premium features require an upgraded account';
} else {
- directive = Directive.RequiresFreeSubscription;
- placeholder = 'Requires a Free+ account';
+ directives.push(
+ DirectiveQuickPickItem.create(Directive.StartPreview, true),
+ DirectiveQuickPickItem.create(Directive.RequiresFreeSubscription),
+ );
+ placeholder = 'Premium features require an account';
}
}
const step = QuickCommand.createPickStep
Premium features like Git Worktrees and Visual File History are available
with a free account, with many more features coming soon, including a commit graph and GitHub Enterprise
- integration. Access to premium features for private code is available with a paid account.
- Learn more about GitLens premium features.
+ integration. Access to premium features for private repos is available with a paid account.
+
+ Learn more about GitLens premium
+ features.
You can try these premium features for free, without an account, for 3 days. All non-premium features
@@ -83,11 +88,14 @@
You are currently trying premium GitLens features, like Git Worktrees and
Visual File History, for 3 more days.
- Learn more about GitLens premium features.
+
+ Learn more about GitLens premium
+ features.
After that time, a free account will be required to continue using these premium features for public
- code, or you can puchase a paid plan to access premium features for private code.
+ code, or you can puchase a paid plan to access premium features for private repos.
Premium GitLens features like Git Worktrees and Visual File History, a
commit graph (coming soon), and GitHub Enterprise integration (coming soon) are only available with an
- account. Learn more about GitLens premium features.
+ account.
+
+ Learn more about GitLens premium
+ features.
Create a free account to continue trialing premium features for all code for an additional 7 days. All non-premium features will continue to be free without an account.
You are currently trialing premium GitLens features like Git Worktrees and
- Visual File History for both public and private code. In
- 7 days, accessing these premium features for private code will
+ Visual File History for both public and private repos. In
+ 7 days, accessing these premium features for private repos will
require a paid account.
- With your free account, you will continue to have access to premium features for public code, as well as
- all non-premium features.
+ With your free account, you will continue to have access to premium features for public repos, as well
+ as all non-premium features.
To continue using premium GitLens features, please validate the email for the account you created. To continue using premium GitLens features, please verify the email for the account you created. All non-premium features will continue to be free without an account.
With your free account, you have access to GitLens Free+, which unlocks premium features like
- Git Worktrees and Visual File History for public code. More premium
+ Git Worktrees and Visual File History for public repos. More premium
features like a commit graph and GitHub Enterprise integration are coming soon.
- Learn more about GitLens premium features.
Access to premium features for private code requires a paid plan.
+ Learn more about GitLens premium
+ features.
+ Access to premium features for private repos requires a paid plan.Welcome to GitLens 12!
individually.
- Try GitLens Premium Features
Trying Premium Features
Continue using Premium Features
Continue using Premium Features
Premium Feature Trial
Premium Feature Trial
Please validate your email
- Please verify your email
+ Please validate your email
GitLens Free+
GitLens Pro
Additional premium featues like a commit graph and GitHub Enterprise integration are coming soon.
Learn more about GitLens premium features.