Skip to content

Commit

Permalink
Changes GitKraken Workspaces to Cloud Workspaces
Browse files Browse the repository at this point in the history
  • Loading branch information
@eamodio
eamodio committed Nov 11, 2024
1 parent 219d620 commit 0738d46
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 41 deletions.
19 changes: 6 additions & 13 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand Down Expand Up @@ -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.


<figure align="center">
<img src="https://raw.githubusercontent.com/gitkraken/vscode-gitlens/main/images/docs/worktrees.png" alt="Worktrees view" />
</figure>


# 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)
Expand Down Expand Up @@ -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** &mdash; Quick access to many features.
- [**Cloud Patches `Preview`**](#cloud-patches-preview) &mdash; Easily and securely share code with your teammates
- [**GitKraken Workspaces `Preview`**](#gitkraken-workspaces-preview) &mdash; Easily group and manage multiple repositories together, accessible from anywhere, streamlining your workflow.
- **GitKraken Account** &mdash; Power-up with GitKraken Cloud Services.
- [**Cloud Workspaces `Preview`**](#gitkraken-workspaces-preview) &mdash; Easily group and manage multiple repositories together, accessible from anywhere, streamlining your workflow.

### Source Control

Expand All @@ -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`

Expand Down Expand Up @@ -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.
Expand Down
50 changes: 25 additions & 25 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3134,7 +3134,7 @@
},
{
"id": "workspaces-view",
"title": "GitKraken Workspaces View (ᴘʀᴇᴠɪᴇᴡ)",
"title": "Cloud Workspaces View (ᴘʀᴇᴠɪᴇᴡ)",
"order": 260,
"properties": {
"gitlens.views.workspaces.showBranchComparison": {
Expand All @@ -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
},
Expand All @@ -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
},
Expand All @@ -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
},
Expand All @@ -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
},
Expand All @@ -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
}
Expand Down Expand Up @@ -6123,7 +6123,7 @@
},
{
"command": "gitlens.showWorkspacesView",
"title": "Show GitKraken Workspaces View",
"title": "Show Cloud Workspaces View",
"category": "GitLens"
},
{
Expand Down Expand Up @@ -8979,7 +8979,7 @@
},
{
"command": "gitlens.views.workspaces.info",
"title": "Learn about GitKraken Workspaces...",
"title": "Learn about Cloud Workspaces...",
"category": "GitLens",
"icon": "$(info)"
},
Expand Down
2 changes: 1 addition & 1 deletion src/plus/workspaces/workspacesService.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/webviews/apps/home/components/feature-nav.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,10 +282,10 @@ export class GlFeatureNav extends GlElement {
<a
class="nav-list__link${this.blockRepoFeatures ? ' is-disabled' : ''}"
href="command:gitlens.showWorkspacesView"
aria-label="Show GitKraken Workspaces view"
aria-label="Show Cloud Workspaces view"
data-requires="repo"
><code-icon class="nav-list__icon" icon="gl-workspaces-view"></code-icon
><gl-tooltip hoist class="nav-list__label" content="Show GitKraken Workspaces view">
><gl-tooltip hoist class="nav-list__label" content="Show Cloud Workspaces view">
<span>Cloud Workspaces</span></gl-tooltip
>
</a>
Expand Down

0 comments on commit 0738d46

Please sign in to comment.