diff --git a/README.md b/README.md index d5b616265dd29..fe76ad68ecda5 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,6 @@ Install GitLens by clicking `Install` on the banner above, or from the Extension > Have questions or concerns? Talk to our engineering team directly through our [GitHub Discussions](https://github.com/gitkraken/vscode-gitlens/discussions/categories/feedback) page. Having a positive experience with GitLens? Feel free to [write a review](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens&ssr=false#review-details). - ## GitLens Editions: Free and Pro **GitLens Free** gives you powerful tools to manage Git and understand how your code has evolved and by whom. With popular features like in-editor blame annotations, hovers, and CodeLens, you can see actionable authorship details at the top of each file. Track the history of any file over time using Revision Navigation to gain deeper insights into code changes. @@ -45,13 +44,12 @@ You can [try GitLens Pro for free](https://gitkraken.dev/register?product=gitlen GitLens offers a wide range of features—here are the three most popular workflows that users rely on to boost their productivity: -- [**Interactive Code History**](#interactive-code-history) — Understanding code in repositories with multiple branches and contributors can be difficult. GitLens provides the context you need with tools like blame, hovers, and file annotations. But it doesn’t stop there—the interactive Commit Graph lets you create branches, rebase, revert, and more, all with powerful search capabilities. +- [**Interactive Code History**](#interactive-code-history) — Understanding code in repositories with multiple branches and contributors can be difficult. GitLens provides the context you need with tools like blame, hovers, and file annotations. But it doesn’t stop there—the interactive Commit Graph lets you create branches, rebase, revert, and more, all with powerful search capabilities. -- [**Accelerate PR Reviews**](#accelerate-pr-reviews) — Reduce context switching and manage all your PRs in one place. Prioritize tasks and identify bottlenecks right in VS Code with Launchpad when you integrate Github or other host providers. Work on multiple branches at once without disrupting your main workspace with Worktrees. +- [**Accelerate PR Reviews**](#accelerate-pr-reviews) — Reduce context switching and manage all your PRs in one place. Prioritize tasks and identify bottlenecks right in VS Code with Launchpad when you integrate Github or other host providers. Work on multiple branches at once without disrupting your main workspace with Worktrees. - [**Streamline Collaboration**](#streamline-collaboration) — GitLens isn’t just for solo developers—it’s designed to enhance team collaboration. With Cloud Patches and Code Suggest, you can share and discuss suggested changes with any GitLens or GitKraken user, on multiple files and even PRs. - # Interactive Code History Understanding who made changes, when, and why can be challenging. GitLens simplifies this with tools like the Commit Graph, Inspect, Inline Blame, and Hovers, giving you clear context and insights. Quickly explore your repository's history with intuitive visuals and actionable tools. @@ -147,17 +145,14 @@ Launchpad consolidates all your GitHub pull requests into a unified, actionable Worktrees enable efficient multitasking by allowing you to work on multiple branches without stashing changes or leaving your current branch. They preserve your workflow while letting you shift focus when needed. For example, you can easily review a pull request on a worktree in a separate VS Code window with GitLens. -
Worktrees view
- # Streamline Collaboration GitLens isn’t just for solo developers—it’s designed to enhance team collaboration. Sharing code can be tricky without adding noise to your repository with extra commits or branches. GitLens simplifies this with Cloud Patches and Code Suggest, letting you share or propose changes to any file in the repository without committing or pushing to a remote. - ## Cloud Patches `Preview` Easily and securely share code changes by creating a Cloud Patch from your work-in-progress, commit, or stash, and sharing a link with teammates or other developers. Cloud Patches enable early collaboration for feedback on direction and approach, reducing rework and streamlining your workflow. [Learn more](https://gitkraken.com/solutions/cloud-patches?utm_source=gitlens-extension&utm_medium=in-app-links) @@ -195,12 +190,11 @@ An x-ray or developer tools Inspect into your code, focused on providing context ### GitLens -Quick access to many GitLens features. Also the home of GitKraken teams and collaboration services (e.g. GitKraken Workspaces), help, and support. +Quick access to many GitLens features. Also the home of GitKraken teams and collaboration services (e.g. Cloud Patches, Cloud Workspaces), help, and support. - **Home** — Quick access to many features. - [**Cloud Patches `Preview`**](#cloud-patches-preview) — Easily and securely share code with your teammates -- [**GitKraken Workspaces `Preview`**](#gitkraken-workspaces-preview) — Easily group and manage multiple repositories together, accessible from anywhere, streamlining your workflow. -- **GitKraken Account** — Power-up with GitKraken Cloud Services. +- [**Cloud Workspaces `Preview`**](#gitkraken-workspaces-preview) — Easily group and manage multiple repositories together, accessible from anywhere, streamlining your workflow. ### Source Control @@ -219,9 +213,9 @@ Shows additional views that are focused on exploring and managing your repositor Convenient and easy access to the Commit Graph with a dedicated details view. -## GitKraken Workspaces `Preview` +## Cloud Workspaces `Preview` -GitKraken Workspaces allow you to easily group and manage multiple repositories together, accessible from anywhere, streamlining your workflow. Create workspaces just for yourself or share (coming soon in GitLens) them with your team for faster onboarding and better collaboration. [Learn more](https://gitkraken.com/solutions/workspaces?utm_source=gitlens-extension&utm_medium=in-app-links) +Cloud Workspaces allow you to easily group and manage multiple repositories together, accessible from anywhere, streamlining your workflow. Create workspaces just for yourself or share (coming soon in GitLens) them with your team for faster onboarding and better collaboration. [Learn more](https://gitkraken.com/solutions/workspaces?utm_source=gitlens-extension&utm_medium=in-app-links) ## Visual File History `Pro` @@ -261,7 +255,6 @@ Use a series of new commands to: - View and explore your stashes - Visualize the current repository status - # Integrations Context switching kills productivity. GitLens not only reveals buried knowledge within your repository, it also brings additional context from issues and pull requests providing you with a wealth of information and insights at your fingertips. diff --git a/package.json b/package.json index a56d3e1aeb5e4..031106390ddb2 100644 --- a/package.json +++ b/package.json @@ -3134,7 +3134,7 @@ }, { "id": "workspaces-view", - "title": "GitKraken Workspaces View (ᴘʀᴇᴠɪᴇᴡ)", + "title": "Cloud Workspaces View (ᴘʀᴇᴠɪᴇᴡ)", "order": 260, "properties": { "gitlens.views.workspaces.showBranchComparison": { @@ -3153,105 +3153,105 @@ "Compares the working tree with a user-selected reference" ], "default": "working", - "markdownDescription": "Specifies whether to show a comparison of the current branch or the working tree with a user-selected reference (branch, tag, etc) in the _GitKraken Workspaces_ view", + "markdownDescription": "Specifies whether to show a comparison of the current branch or the working tree with a user-selected reference (branch, tag, etc) in the _Cloud Workspaces_ view", "scope": "window", "order": 10 }, "gitlens.views.workspaces.showUpstreamStatus": { "type": "boolean", "default": true, - "markdownDescription": "Specifies whether to show the upstream status of the current branch for each repository in the _GitKraken Workspaces_ view", + "markdownDescription": "Specifies whether to show the upstream status of the current branch for each repository in the _Cloud Workspaces_ view", "scope": "window", "order": 11 }, "gitlens.views.workspaces.includeWorkingTree": { "type": "boolean", "default": false, - "markdownDescription": "Specifies whether to include working tree file status for each repository in the _GitKraken Workspaces_ view", + "markdownDescription": "Specifies whether to include working tree file status for each repository in the _Cloud Workspaces_ view", "scope": "window", "order": 12 }, "gitlens.views.workspaces.pullRequests.enabled": { "type": "boolean", "default": true, - "markdownDescription": "Specifies whether to query for pull requests associated with branches and commits in the _GitKraken Workspaces_ view. Requires a connection to a supported remote service (e.g. GitHub)", + "markdownDescription": "Specifies whether to query for pull requests associated with branches and commits in the _Cloud Workspaces_ view. Requires a connection to a supported remote service (e.g. GitHub)", "scope": "window", "order": 20 }, "gitlens.views.workspaces.pullRequests.showForBranches": { "type": "boolean", "default": true, - "markdownDescription": "Specifies whether to show pull requests (if any) associated with branches in the _GitKraken Workspaces_ view. Requires a connection to a supported remote service (e.g. GitHub)", + "markdownDescription": "Specifies whether to show pull requests (if any) associated with branches in the _Cloud Workspaces_ view. Requires a connection to a supported remote service (e.g. GitHub)", "scope": "window", "order": 21 }, "gitlens.views.workspaces.pullRequests.showForCommits": { "type": "boolean", "default": true, - "markdownDescription": "Specifies whether to show pull requests (if any) associated with commits in the _GitKraken Workspaces_ view. Requires a connection to a supported remote service (e.g. GitHub)", + "markdownDescription": "Specifies whether to show pull requests (if any) associated with commits in the _Cloud Workspaces_ view. Requires a connection to a supported remote service (e.g. GitHub)", "scope": "window", "order": 22 }, "gitlens.views.workspaces.showCommits": { "type": "boolean", "default": true, - "markdownDescription": "Specifies whether to show the commits on the current branch for each repository in the _GitKraken Workspaces_ view", + "markdownDescription": "Specifies whether to show the commits on the current branch for each repository in the _Cloud Workspaces_ view", "scope": "window", "order": 30 }, "gitlens.views.workspaces.showBranches": { "type": "boolean", "default": true, - "markdownDescription": "Specifies whether to show the branches for each repository in the _GitKraken Workspaces_ view", + "markdownDescription": "Specifies whether to show the branches for each repository in the _Cloud Workspaces_ view", "scope": "window", "order": 31 }, "gitlens.views.workspaces.showRemotes": { "type": "boolean", "default": true, - "markdownDescription": "Specifies whether to show the remotes for each repository in the _GitKraken Workspaces_ view", + "markdownDescription": "Specifies whether to show the remotes for each repository in the _Cloud Workspaces_ view", "scope": "window", "order": 32 }, "gitlens.views.workspaces.showStashes": { "type": "boolean", "default": true, - "markdownDescription": "Specifies whether to show the stashes for each repository in the _GitKraken Workspaces_ view", + "markdownDescription": "Specifies whether to show the stashes for each repository in the _Cloud Workspaces_ view", "scope": "window", "order": 33 }, "gitlens.views.workspaces.showTags": { "type": "boolean", "default": true, - "markdownDescription": "Specifies whether to show the tags for each repository in the _GitKraken Workspaces_ view", + "markdownDescription": "Specifies whether to show the tags for each repository in the _Cloud Workspaces_ view", "scope": "window", "order": 34 }, "gitlens.views.workspaces.showContributors": { "type": "boolean", "default": true, - "markdownDescription": "Specifies whether to show the contributors for each repository in the _GitKraken Workspaces_ view", + "markdownDescription": "Specifies whether to show the contributors for each repository in the _Cloud Workspaces_ view", "scope": "window", "order": 35 }, "gitlens.views.workspaces.showWorktrees": { "type": "boolean", "default": true, - "markdownDescription": "Specifies whether to show the worktrees for each repository in the _GitKraken Workspaces_ view", + "markdownDescription": "Specifies whether to show the worktrees for each repository in the _Cloud Workspaces_ view", "scope": "window", "order": 36 }, "gitlens.views.workspaces.showIncomingActivity": { "type": "boolean", "default": false, - "markdownDescription": "Specifies whether to show the experimental incoming activity for each repository in the _GitKraken Workspaces_ view", + "markdownDescription": "Specifies whether to show the experimental incoming activity for each repository in the _Cloud Workspaces_ view", "scope": "window", "order": 37 }, "gitlens.views.workspaces.avatars": { "type": "boolean", "default": true, - "markdownDescription": "Specifies whether to show avatar images instead of commit (or status) icons in the _GitKraken Workspaces_ view", + "markdownDescription": "Specifies whether to show avatar images instead of commit (or status) icons in the _Cloud Workspaces_ view", "scope": "window", "order": 60 }, @@ -3266,7 +3266,7 @@ "Displays branches as a list", "Displays branches as a tree when branch names contain slashes `/`" ], - "markdownDescription": "Specifies how the _GitKraken Workspaces_ view will display branches", + "markdownDescription": "Specifies how the _Cloud Workspaces_ view will display branches", "scope": "window", "order": 70 }, @@ -3283,21 +3283,21 @@ "Displays files as a list", "Displays files as a tree" ], - "markdownDescription": "Specifies how the _GitKraken Workspaces_ view will display files", + "markdownDescription": "Specifies how the _Cloud Workspaces_ view will display files", "scope": "window", "order": 80 }, "gitlens.views.workspaces.files.threshold": { "type": "number", "default": 5, - "markdownDescription": "Specifies when to switch between displaying files as a `tree` or `list` based on the number of files in a nesting level in the _GitKraken Workspaces_ view. Only applies when `#gitlens.views.workspaces.files.layout#` is set to `auto`", + "markdownDescription": "Specifies when to switch between displaying files as a `tree` or `list` based on the number of files in a nesting level in the _Cloud Workspaces_ view. Only applies when `#gitlens.views.workspaces.files.layout#` is set to `auto`", "scope": "window", "order": 81 }, "gitlens.views.workspaces.files.compact": { "type": "boolean", "default": true, - "markdownDescription": "Specifies whether to compact (flatten) unnecessary file nesting in the _GitKraken Workspaces_ view. Only applies when `#gitlens.views.workspaces.files.layout#` is set to `tree` or `auto`", + "markdownDescription": "Specifies whether to compact (flatten) unnecessary file nesting in the _Cloud Workspaces_ view. Only applies when `#gitlens.views.workspaces.files.layout#` is set to `tree` or `auto`", "scope": "window", "order": 82 }, @@ -3312,14 +3312,14 @@ "Shows the file's status as the icon", "Shows the file's type (theme icon) as the icon" ], - "markdownDescription": "Specifies how the _GitKraken Workspaces_ view will display file icons", + "markdownDescription": "Specifies how the _Cloud Workspaces_ view will display file icons", "scope": "window", "order": 83 }, "gitlens.views.workspaces.compact": { "type": "boolean", "default": false, - "markdownDescription": "Specifies whether to show the _GitKraken Workspaces_ view in a compact display density", + "markdownDescription": "Specifies whether to show the _Cloud Workspaces_ view in a compact display density", "scope": "window", "order": 90 }, @@ -3337,7 +3337,7 @@ "Compares the branch with a user-selected reference" ], "default": "branch", - "markdownDescription": "Specifies whether to show a comparison of the branch with a user-selected reference (branch, tag, etc) under each branch in the _GitKraken Workspaces_ view", + "markdownDescription": "Specifies whether to show a comparison of the branch with a user-selected reference (branch, tag, etc) under each branch in the _Cloud Workspaces_ view", "scope": "window", "order": 100 } @@ -6123,7 +6123,7 @@ }, { "command": "gitlens.showWorkspacesView", - "title": "Show GitKraken Workspaces View", + "title": "Show Cloud Workspaces View", "category": "GitLens" }, { @@ -8979,7 +8979,7 @@ }, { "command": "gitlens.views.workspaces.info", - "title": "Learn about GitKraken Workspaces...", + "title": "Learn about Cloud Workspaces...", "category": "GitLens", "icon": "$(info)" }, diff --git a/src/plus/workspaces/workspacesService.ts b/src/plus/workspaces/workspacesService.ts index 1916dd406541b..d22de86f38a82 100644 --- a/src/plus/workspaces/workspacesService.ts +++ b/src/plus/workspaces/workspacesService.ts @@ -323,7 +323,7 @@ export class WorkspacesService implements Disposable { const change = { title: 'Change Auto-Add Behavior...' }; const cancel = { title: 'Cancel', isCloseAffordance: true }; const addChoice = await window.showInformationMessage( - 'New repositories found in the linked GitKraken workspace. Would you like to add them to the current VS Code workspace?', + 'New repositories found in the linked Cloud workspace. Would you like to add them to the current VS Code workspace?', add, change, cancel, diff --git a/src/webviews/apps/home/components/feature-nav.ts b/src/webviews/apps/home/components/feature-nav.ts index c194d65ea7f1e..3f89e426e0447 100644 --- a/src/webviews/apps/home/components/feature-nav.ts +++ b/src/webviews/apps/home/components/feature-nav.ts @@ -282,10 +282,10 @@ export class GlFeatureNav extends GlElement { + > Cloud Workspaces