diff --git a/.vscodeignore b/.vscodeignore index 3185ed0..7695c04 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -4,13 +4,8 @@ .vscode/** dist/ui/** emoji/** -!images/dark/** -!images/light/** -!images/settings/** -!images/gitlens-icon.png -!images/gitlens-activitybar.svg -!images/cl-*.png -images/** +images/docs/** +images/**/*.pdn node_modules/** src/** test/** diff --git a/CHANGELOG.md b/CHANGELOG.md index 23fac61..4e11f05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -148,7 +148,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Added - Adds completely revamped heatmap annotations - ![cold heatmap](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-heatmap-cold.png) + ![cold heatmap](https://raw.githubusercontent.com/eamodio/vscode-gitlens/4ddb871459a3a1a1e132c8bdf83ac12e3b699649/images/cl-heatmap-cold.png) - The indicator's color, now customizable, will either be hot or cold based on the age of the most recent change (cold after 90 days by default) — closes [#419](https://github.com/eamodio/vscode-gitlens/issues/419) - The indicator's brightness ranges from bright (newer) to dim (older) based on the relative age, which is calculated from the median age of all the changes in the file - Adds `gitlens.heatmap.ageThreshold` setting to specify the age of the most recent change (in days) after which the gutter heatmap annotations will be cold rather than hot (i.e. will use `gitlens.heatmap.coldColor` instead of `gitlens.heatmap.hotColor`) @@ -235,7 +235,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Adds user-defined modes for quickly toggling between sets of settings - ![mode switch](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-mode-switch.png) + ![mode switch](https://raw.githubusercontent.com/eamodio/vscode-gitlens/4ddb871459a3a1a1e132c8bdf83ac12e3b699649/images/cl-mode-switch.png) - Adds _Switch Mode_ command (`gitlens.switchMode`) to quickly switch the active GitLens mode - Adds a built-in _Zen_ mode which for a zen-like experience, disables many visual features @@ -247,7 +247,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Adds `gitlens.mode.statusBar.alignment` setting to specify the active GitLens mode alignment in the status bar - Adds modes settings (`gitlens.mode.*`) to the interactive settings editor - ![modes settings](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-modes-settings.png) + ![modes settings](https://raw.githubusercontent.com/eamodio/vscode-gitlens/4ddb871459a3a1a1e132c8bdf83ac12e3b699649/images/cl-modes-settings.png) - Adds `gitlens.mode.active` setting to specify the active GitLens mode, if any - Adds `gitlens.modes` setting to specify the user-defined GitLens modes @@ -256,11 +256,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Adds an icon for the _Compare File with Next Revision_ command (`gitlens.diffWithNext`) and moves it into the editor toolbar - Adds menu settings (`gitlens.menus.*`) to the interactive settings editor - ![menu settings](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-menu-settings.png) + ![menu settings](https://raw.githubusercontent.com/eamodio/vscode-gitlens/4ddb871459a3a1a1e132c8bdf83ac12e3b699649/images/cl-menu-settings.png) - Adds a display mode dropdown at the top of the interactive settings editor to reduce complexity - ![settings mode](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-settings-mode.png) + ![settings mode](https://raw.githubusercontent.com/eamodio/vscode-gitlens/4ddb871459a3a1a1e132c8bdf83ac12e3b699649/images/cl-settings-mode.png) - Adds `gitlens.settings.mode` setting to specify the display mode of the interactive settings editor @@ -346,33 +346,33 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Adds new stand-alone _GitLens File History_ explorer to visualize the history of the current file — undocked version of the _GitLens_ explorer history view - ![GitLens File History explorer](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/ss-gitlens-history-explorer.png) + ![GitLens File History explorer](https://raw.githubusercontent.com/eamodio/vscode-gitlens/4ddb871459a3a1a1e132c8bdf83ac12e3b699649/images/ss-gitlens-history-explorer.png) - Adds richer tooltips to the _GitLens_ and _GitLens Results_ explorers, and richer working tree and upstream status to the _GitLens_ explorer - ![Rich tooltips](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-rich-tooltips.png) + ![Rich tooltips](https://raw.githubusercontent.com/eamodio/vscode-gitlens/4ddb871459a3a1a1e132c8bdf83ac12e3b699649/images/cl-rich-tooltips.png) - Adds an indicator to the _GitLens_ explorer's branch history to mark the synchronization point between the local and remote branch (if available) - ![Branch upstream indicator](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-branch-upstream-indicator.png) + ![Branch upstream indicator](https://raw.githubusercontent.com/eamodio/vscode-gitlens/4ddb871459a3a1a1e132c8bdf83ac12e3b699649/images/cl-branch-upstream-indicator.png) - Adds ability to easily switch between relative and absolute dates via the `gitlens.defaultDateStyle` settings — closes [#312](https://github.com/eamodio/vscode-gitlens/issues/312) - Adds `${agoOrDate}` and `${authorAgoOrDate}` tokens to `gitlens.blame.format`, `gitlens.currentLine.format`, `gitlens.explorers.commitFormat`, `gitlens.explorers.stashFormat`, and `gitlens.statusBar.format` settings which will honor the `gitlens.defaultDateStyle` setting - ![General settings](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-general-settings.png) + ![General settings](https://raw.githubusercontent.com/eamodio/vscode-gitlens/4ddb871459a3a1a1e132c8bdf83ac12e3b699649/images/cl-general-settings.png) - Adds annotation format settings (`gitlens.*.format`) to the interactive settings editor - ![Annotation format settings](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-annotation-format.png) + ![Annotation format settings](https://raw.githubusercontent.com/eamodio/vscode-gitlens/4ddb871459a3a1a1e132c8bdf83ac12e3b699649/images/cl-annotation-format.png) - Adds new `gitlens.currentLine.scrollable` setting to specify whether the current line blame annotation can be scrolled into view when it is outside the viewport — closes [#149](https://github.com/eamodio/vscode-gitlens/issues/149), [#290](https://github.com/eamodio/vscode-gitlens/issues/290), [#265](https://github.com/eamodio/vscode-gitlens/issues/265) - ![Allow scrolling to annotation setting](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-current-line-scrollable.png) + ![Allow scrolling to annotation setting](https://raw.githubusercontent.com/eamodio/vscode-gitlens/4ddb871459a3a1a1e132c8bdf83ac12e3b699649/images/cl-current-line-scrollable.png) - Adds `gitlens.statusBar.reduceFlicker` setting to the interactive settings editor - ![Reduce status bar flashing setting](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-status-bar-reduce-flashing.png) + ![Reduce status bar flashing setting](https://raw.githubusercontent.com/eamodio/vscode-gitlens/4ddb871459a3a1a1e132c8bdf83ac12e3b699649/images/cl-status-bar-reduce-flashing.png) - Adds a one-time notification on startup if the `alt-based` keyboard shortcuts are in use, with options to easily switch to another set - Adds _Copy Commit ID to Clipboard_ (`gitlens.copyShaToClipboard`) command to changed file nodes in the _GitLens_ explorer and _GitLens Results_ explorer @@ -413,11 +413,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Adds automatic issue linking to Bitbucket, GitHub, GitLab, and Visual Studio Team Services for commit messages in hovers - ![Issue linking in commit messages](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-issue-linking.png) + ![Issue linking in commit messages](https://raw.githubusercontent.com/eamodio/vscode-gitlens/4ddb871459a3a1a1e132c8bdf83ac12e3b699649/images/cl-issue-linking.png) - Adds support to toggle annotations for each file individually or for all files at once — closes [#289](https://github.com/eamodio/vscode-gitlens/issues/289) - ![Annotations toggle setting](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-annotations-toggle.png) + ![Annotations toggle setting](https://raw.githubusercontent.com/eamodio/vscode-gitlens/4ddb871459a3a1a1e132c8bdf83ac12e3b699649/images/cl-annotations-toggle.png) - Adds new controls the interactive settings editor (_Open Settings_ from the Command Palette) to configure this new behavior - Adds `gitlens.blame.toggleMode` setting to specify how the gutter blame annotations will be toggled, per file or window @@ -476,11 +476,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Adds an all-new GitLens welcome page via the _Welcome_ (`gitlens.showWelcomePage`) command — provides a welcome / onboarding experience — closes [#51](https://github.com/eamodio/vscode-gitlens/issues/51) - ![GitLens Welcome](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-welcome.png) + ![GitLens Welcome](https://raw.githubusercontent.com/eamodio/vscode-gitlens/4ddb871459a3a1a1e132c8bdf83ac12e3b699649/images/cl-welcome.png) - Adds an all-new GitLens Settings editor via the _Open Settings_ (`gitlens.showSettingsPage`) command — provides an easy-to-use interactive settings editor for many of GitLens' features — closes [#167](https://github.com/eamodio/vscode-gitlens/issues/167) - ![GitLens Settings](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-settings.png) + ![GitLens Settings](https://raw.githubusercontent.com/eamodio/vscode-gitlens/4ddb871459a3a1a1e132c8bdf83ac12e3b699649/images/cl-settings.png) - Adds a tree layout option to branches in the _GitLens_ explorer — closes [#258](https://github.com/eamodio/vscode-gitlens/issues/258) thanks to [PR #260](https://github.com/eamodio/vscode-gitlens/pull/260) by Yukai Huang ([@Yukaii](https://github.com/Yukaii))! - Adds _Follow Renames_ command (`gitlens.gitExplorer.setRenameFollowingOn`) to the _GitLens_ explorer _History_ view to follow file renames in the history @@ -1047,7 +1047,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Adds a **quick-access** command bar to the bottom of the **details** hover annotations - ![Details Blame Annotation (hover)](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/ss-hovers-current-line-details.png) + ![Details Blame Annotation (hover)](https://raw.githubusercontent.com/eamodio/vscode-gitlens/4ddb871459a3a1a1e132c8bdf83ac12e3b699649/images/ss-hovers-current-line-details.png) - Provides _Open Changes_, _Blame Previous Revision_, _Open in Remote_, and _Show More Actions_ command buttons @@ -1167,7 +1167,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - **Repository View** - provides a full repository explorer - ![GitLens Repository view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/ss-gitlens-explorer-repository.png) + ![GitLens Repository view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/4ddb871459a3a1a1e132c8bdf83ac12e3b699649/images/ss-gitlens-explorer-repository.png) - **Repository Status** node — provides the status of the repository @@ -1209,7 +1209,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - **File History View** - provides the revision history of the active file - ![GitLens File History view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/ss-gitlens-explorer-history.png) + ![GitLens File History view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/4ddb871459a3a1a1e132c8bdf83ac12e3b699649/images/ss-gitlens-explorer-history.png) - Automatically updates to track the active editor - Provides a context menu with _Open File_, _Open File in Remote_, and _Refresh_ commands @@ -1220,7 +1220,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Adds all-new interactivity to the hover annotations - ![Hover Annotations](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/ss-hovers-annotations.png) + ![Hover Annotations](https://raw.githubusercontent.com/eamodio/vscode-gitlens/4ddb871459a3a1a1e132c8bdf83ac12e3b699649/images/ss-hovers-annotations.png) - Adds the following command-links to the **details** hover annotation - Clicking the commit id will run the _Show Commit Details_ command diff --git a/README.md b/README.md index 0c584af..e5230ff 100644 --- a/README.md +++ b/README.md @@ -5,67 +5,16 @@


- GitLens Logo + GitLens Logo

> GitLens **supercharges** the Git capabilities built into Visual Studio Code. It helps you to **visualize code authorship** at a glance via Git blame annotations and code lens, **seamlessly navigate and explore** Git repositories, **gain valuable insights** via powerful comparison commands, and so much more.
+https://raw.githubusercontent.com/eamodio/vscode-gitlens/blob/cd90faa526720cb4b07a52b3cf84abaa55a978a0/images/cl-heatmap-cold.png +# What's new in GitLens 9 -# What's new in GitLens 8 - -## 8.5 — July 2018 - -- Adds an all-new _GitLens_ sidebar view to contain the _GitLens_, _GitLens File History_, and _GitLens Results_ explorers -- The new view is enabled by default, but can easily be configured back to the existing locations via the _GitLens_ interactive settings editor -- Adds emoji support, e.g. :smile: in commit messages will now be 😃 — closes [#429](https://github.com/eamodio/vscode-gitlens/issues/429) -- Adds _Compare with Selected_ and _Select for Compare_ commands to file nodes in the _GitLens_, _GitLens File History_, and _GitLens Results_ explorers — closes [#446](https://github.com/eamodio/vscode-gitlens/issues/446) -- Adds tag annotations to the tag tooltips in the _GitLens_ explorer — closes [#431](https://github.com/eamodio/vscode-gitlens/issues/431) -- Adds _Choose from Branch or Tag History..._ to the quick pick menu shown by the _Show File History..._ command (`gitlens.showQuickFileHistory`) — closes [#316](https://github.com/eamodio/vscode-gitlens/issues/316) -- Adds the _Open Changes with Revision..._ command (`gitlens.diffWithRevision`) as an alternate (`alt+click`) for the _Open Changes with Previous Revision_ command in the editor toolbar -- Adds _Checkout Commit (via Terminal)_ command (`gitlens.terminalCheckoutCommit`) to commit node(s) of the _GitLens_ explorer — closes [#463](https://github.com/eamodio/vscode-gitlens/issues/463) -- Adds `gitlens.historyExplorer.avatars` setting to specify whether to show avatar images instead of status icons in the _GitLens File History_ explorer — allows for an independent value from the other explorers -- Adds a `gitlens.hovers.avatars` setting to specify whether to show avatar images in hovers — closes [#432](https://github.com/eamodio/vscode-gitlens/issues/432) thanks to [PR #441](https://github.com/eamodio/vscode-gitlens/pull/441) by Segev Finer ([@segevfiner](https://github.com/segevfiner)) -- Adds the `gitlens.hovers.avatars` setting to the _GitLens_ interactive settings editor to specify whether to show avatar images in hovers -- Adds _Copy Remote File Url to Clipboard_ (`gitlens.copyRemoteFileUrlToClipboard`) command — copies the remote url of the current file and line to the clipboard — closes [#467](https://github.com/eamodio/vscode-gitlens/issues/467) -- Improves performance of providing blame annotations, especially for large files (a ~33% improvement on some files) -- Changes commit search by sha to jump directly to the commit (if one is found), rather than having to click through to the commit -- Renames the _GitLens History_ explorer to _GitLens File History_ explorer for better clarity -- Changes the _GitLens File History_ explorer to always show the full file history even when reviewing revisions -- Changes the behavior of and renames the _Show Branches and Tags_ command and on the quick pick menu shown by the _Open Changes with Revision..._ command (`gitlens.diffWithRevision`) to _Choose from Branch or Tag History..._ -- Changes the behavior of and renames the _Show Branches and Tags_ command on the quick pick menu shown by the _Open Revision..._ command (`gitlens.openFileRevision`) to _Choose from Branch or Tag History..._ -- Changes _Rebase to Commit (via Terminal)_ command (`gitlens.terminalRebaseCommit`) to apply to all commit node(s) of the _GitLens_ explorer -- Changes _Reset to Commit (via Terminal)_ command (`gitlens.terminalResetCommit`) to apply to all commit node(s) of the _GitLens_ explorer -- Updates settings descriptions to better support the new settings editor in vscode -- Removes `gitlens:activeIsTracked`, `gitlens:activeIsBlameable`, `gitlens:activeIsRevision`, and `gitlens:activeHasRemotes` contexts and consolidates them into `gitlens:activeFileStatus` for better performance and UX -- Fixes [#436](https://github.com/eamodio/vscode-gitlens/issues/436) - Copy to clipboard not working -- Fixes [#442](https://github.com/eamodio/vscode-gitlens/issues/442) - GitLens File History fails if name (or path) starts with `-` -- Fixes [#440](https://github.com/eamodio/vscode-gitlens/issues/440) - Searching for commits with an empty query yields to no results anymore -- Fixes [#444](https://github.com/eamodio/vscode-gitlens/issues/444) - GitLens custom viewlet icon slightly larger than standard -- Fixes [#437](https://github.com/eamodio/vscode-gitlens/issues/437) - Remove `--first-parent` from git commands to show file history from merged in repositories -- Fixes [#252](https://github.com/eamodio/vscode-gitlens/issues/252) - Cannot read property 'push' of undefined -- Fixes [#451](https://github.com/eamodio/vscode-gitlens/issues/451) - "apply Changes" has discarded all my changes -- Fixes [#449](https://github.com/eamodio/vscode-gitlens/issues/449) - Stop hiding explorers by default when in Zen mode -- Fixes [#454](https://github.com/eamodio/vscode-gitlens/issues/454) - Search for string returns merge commits (unlike raw `git log -S`) -- Fixes [#462](https://github.com/eamodio/vscode-gitlens/issues/462) - Source Control shortcut on macOS (⌃⇧G) shouldn't be overridden -- Fixes [#457](https://github.com/eamodio/vscode-gitlens/issues/457) - Displays the wrong username (You) — thanks to [PR #460](https://github.com/eamodio/vscode-gitlens/pull/460) by Zyck ([@qzyse2017](https://github.com/qzyse2017)) -- Fixes [#459](https://github.com/eamodio/vscode-gitlens/issues/459) - File blame annotation text overflow with letter spacing setting -- Fixes [#471](https://github.com/eamodio/vscode-gitlens/issues/471) - Don't use Ctrl+Alt+[character] as a shortcut -- Fixes [#478](https://github.com/eamodio/vscode-gitlens/issues/478) - `suppressShowKeyBindingsNotice` gets saved even when it is not required -- Fixes [#468](https://github.com/eamodio/vscode-gitlens/issues/468) - Commit history for detached HEAD doesn't work properly -- Fixes [#477](https://github.com/eamodio/vscode-gitlens/issues/477) - Can't load any GitLens features or UI -- Fixes [#482](https://github.com/eamodio/vscode-gitlens/issues/482) - UI displays "undefined" in results panel when comparing -- Fixes issues with GitLens Welcome and the interactive settings editor with light themes -- Fixes issue where commands in the editor toolbar would flash unnecessarily when navigating history or switching tabs -- Fixes issue where the _Open Changes with Previous Revision_ command wouldn't work properly when the file had been renamed in some cases -- Fixes issue where the _Open Changes with Next Revision_ command wouldn't work properly when the file had been renamed in some cases -- Fixes issue where changed files count was wrong when the branch was behind the upstream -- Fixes issue where the _GitLens File History_ explorer wasn't being updated automatically for working changes -- Fixes issue where the _Compare File with \* Revision_ commands in the editor toolbar would show and hide too often because of insignificant focus changes -- Fixes issue where the scope box would be empty when there was no workspace open in the interactive settings editor -- Fixes issue where GitLens saves a couple settings with default values into user settings (rather than just removing the setting) -- Fixes issue showing changes with untracked stashed files -- Fixes issue showing changes with working file when the file has been renamed +## 9.0 — September 2018 See the [release notes](https://github.com/eamodio/vscode-gitlens/blob/master/CHANGELOG.md 'Open Release Notes') for the full set of changes @@ -78,14 +27,15 @@ GitLens simply helps you understand code better. Quickly glimpse into whom, why, 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 -- a [_GitLens File History_ explorer](#gitlens-file-history-explorer 'Jump to the GitLens File History explorer') to navigate and explore file histories -- a [_GitLens Line History_ explorer](#gitlens-line-history-explorer 'Jump to the GitLens Line History explorer') to navigate and explore file line histories -- an on-demand [_GitLens Results_ explorer](#gitlens-results-explorer 'Jump to the GitLens Results explorer') to navigate and 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 +- a [_Repositories_ explorer](#repositories-explorer 'Jump to the Repositories explorer') to visualize, navigate, and explore Git repositories +- a [_File History_ explorer](#file-history-explorer 'Jump to the File History explorer') to visualize, navigate, and explore the revision history of the current file +- a [_Line History_ explorer](#line-history-explorer 'Jump to the Line History explorer') to visualize, navigate, and explore the revision history of the selected lines of current file +- an on-demand [_Results_ explorer](#results-explorer 'Jump to the Results explorer') to navigate and explore commits, histories, and searches, or 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 - 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 heatmap](#gutter-heatmap 'Jump to the Gutter Heatmap') annotations to show how recently lines were changed, relative to all the other changes in the file and to now (hot vs. cold) +- detailed blame information accessible via [hovers](#hovers 'Jump to Hovers) - on-demand [recent changes](#recent-changes 'Jump to the Recent Changes') annotations to highlight lines changed by the most recent commit - a [status bar blame](#status-bar-blame 'Jump to the Status Bar Blame') annotation showing author and date for the current line - [commit search](#commit-search 'Jump to the Commit Search') — by message, author, filename, commit id, or code changes @@ -96,7 +46,7 @@ GitLens is powerful, feature rich, and also [highly customizable](#gitlens-setti


- GitLens Preview + GitLens Preview

@@ -136,7 +86,7 @@ None yet — could be you! ## Configuration

- GitLens Explorer Repository view + GitLens Interactive Settings

GitLens has a built-in interactive settings editor which provides an easy-to-use interface to configure many of GitLens' powerful features. It can be accessed via the _Open Settings_ (`gitlens.showSettingsPage`) command from the [_Command Palette_](https://code.visualstudio.com/docs/getstarted/userinterface#_command-palette). @@ -145,22 +95,22 @@ For more advanced customizations, refer to the [settings documentation](#gitlens ## Features -### GitLens Explorer +### Repositories Explorer

- GitLens Explorer + Repositories Explorer

-A [customizable](#gitlens-explorer-settings 'Jump to the GitLens Explorer settings') explorer to navigate and explore repositories. +A [customizable](#repositories-explorer-settings 'Jump to the Repositories explorer settings') explorer to visualize, navigate, and explore Git repositories. - A toolbar provides _Search Commits_, and _Refresh_ commands - A context menu provides _Automatic Layout_, _List Layout_, _Tree Layout_, and _Enable Automatic Refresh_ or _Disable Automatic Refresh_ commands -The explorer provides a full Git repository explorer, which has the following features, +The repositories explorer provides the following features, - **Repository Status** - - Provides the name of the current branch, [optionally](#gitlens-explorer-settings 'Jump to the GitLens explorer settings') its working tree status, and its upstream tracking branch and status (if available) + - Provides the name of the current branch, [optionally](#repositories-explorer-settings 'Jump to the Repositories explorer settings') its working tree status, and its upstream tracking branch and status (if available) - Provides indicator dots on the repository icon which denote the following: - _None_ — up-to-date with the upstream - _Green_ — ahead of the upstream @@ -171,13 +121,13 @@ The explorer provides a full Git repository explorer, which has the following fe - is ahead of the upstream — 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 - **Changed Files** — 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](#repositories-explorer-settings 'Jump to the Repositories explorer settings')) and/or all files in all commits ahead of the upstream - **History (current-branch)** — lists the revision (commit) history of the current branch - See the _Branches expand_ section under **Branches** below for more details - **Branches** — lists the local branches - - Indicates which branch is the current branch and [optionally](#gitlens-explorer-settings 'Jump to the GitLens explorer settings') shows the remote tracking branch + - Indicates which branch is the current branch and [optionally](#repositories-explorer-settings 'Jump to the Repositories explorer settings') shows the remote tracking branch - A context menu provides _Open Branches in Remote_, and _Refresh_ commands - Branches expand to show its revision (commit) history - Provides indicator dots on each branch icon which denote the following: @@ -223,18 +173,18 @@ The explorer provides a full Git repository explorer, which has the following fe --- -### GitLens File History Explorer +### File History Explorer

- GitLens File History Explorer + File History Explorer

-A [customizable](#gitlens-file-history-explorer-settings 'Jump to the GitLens File History Explorer settings') explorer to visualize the revision history of the current file. +A [customizable](#file-history-explorer-settings 'Jump to the File History explorer settings') explorer to visualize, navigate, and explore the revision history of the current file. - A toolbar provides a _Refresh_ command - A context menu provides a _Follow Renames_ or _Don't Follow Renames_ command -The file history explorer provides the revision history of the current file, which has the following features, +The file history explorer provides the following features, - Automatically updates to track the current editor - A context menu provides _Open File_, _Open File in Remote_ (if available), _Copy Remote File Url to Clipboard_ (if available), and _Refresh_ commands @@ -244,18 +194,18 @@ The file history explorer provides the revision history of the current file, whi --- -### GitLens Line History Explorer +### Line History Explorer

- GitLens Line History Explorer + Line History Explorer

-A [customizable](#gitlens-line-history-explorer-settings 'Jump to the GitLens Line History Explorer settings') explorer to visualize the revision history of the selected lines of current file. +A [customizable](#line-history-explorer-settings 'Jump to the Line History explorer settings') explorer to visualize, navigate, and explore the revision history of the selected lines of current file. - A toolbar provides a _Refresh_ command - A context menu provides a _Follow Renames_ or _Don't Follow Renames_ command -The line history explorer provides the revision history of the selected lines in the current file, which has the following features, +The line history explorer provides the following features, - Automatically updates to track the selection of the current editor - A context menu provides _Open File_, _Open File in Remote_ (if available), _Copy Remote File Url to Clipboard_ (if available), and _Refresh_ commands @@ -265,17 +215,19 @@ The line history explorer provides the revision history of the selected lines in --- -### GitLens Results Explorer +### Results Explorer

- GitLens Results explorer + Results explorer

-An on-demand, [customizable](#gitlens-results-explorer-settings 'Jump to the GitLens Results explorer settings') explorer to navigate and explore commits, histories, and searches, or visualize comparisons between branches, tags, commits, and more +An on-demand, [customizable](#results-explorer-settings 'Jump to the Results explorer settings') explorer to navigate and 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 context menu provides _Automatic Layout_, _List Layout_, _Tree Layout_, and _Close_ commands +The results explorer provides the following features, + #### Explore - Provides a semi-persistent results view for exploring histories, commits, and searches @@ -319,7 +271,7 @@ An on-demand, [customizable](#gitlens-results-explorer-settings 'Jump to the Git ### Code Lens

- Code Lens + Code Lens

- Adds Git authorship **code lens** to the top of the file and on code blocks ([optional](#code-lens-settings 'Jump to the Code Lens settings'), on by default) @@ -346,7 +298,7 @@ An on-demand, [customizable](#gitlens-results-explorer-settings 'Jump to the Git ### Current Line Blame

- Current Line Blame + Current Line Blame

- Adds an unobtrusive, [customizable](#current-line-blame-settings 'Jump to the Current Line Blame settings'), and [themable](#themable-colors 'Jump to the Themable Colors'), **blame annotation** at the end of the current line @@ -358,7 +310,7 @@ An on-demand, [customizable](#gitlens-results-explorer-settings 'Jump to the Git ### Gutter Blame

- Gutter Blame + Gutter Blame

- Adds on-demand, [customizable](#gutter-blame-settings 'Jump to the Gutter Blame settings'), and [themable](#themable-colors 'Jump to the Themable Colors'), **gutter blame annotations** for the whole file @@ -373,7 +325,7 @@ An on-demand, [customizable](#gitlens-results-explorer-settings 'Jump to the Git ### Gutter Heatmap

- Gutter Heatmap + Gutter Heatmap

- Adds an on-demand **heatmap** to the edge of the gutter to show how recently lines were changed @@ -389,7 +341,7 @@ An on-demand, [customizable](#gitlens-results-explorer-settings 'Jump to the Git #### Current Line Hovers

- Current Line Hovers + Current Line Hovers

- Adds [customizable](#hover-settings 'Jump to the Hover settings') Git blame hovers accessible over the current line @@ -397,7 +349,7 @@ An on-demand, [customizable](#gitlens-results-explorer-settings 'Jump to the Git ##### Details Hover

- Current Line Details Hover + Current Line Details Hover

- Adds a **details hover** annotation to the current line to show more commit details ([optional](#hover-settings 'Jump to the Hover settings'), on by default) @@ -408,7 +360,7 @@ An on-demand, [customizable](#gitlens-results-explorer-settings 'Jump to the Git ##### Changes (diff) Hover

- Current Line Changes (diff) Hover + Current Line Changes (diff) Hover

- Adds a **changes (diff) hover** annotation to the current line to show the line's previous version ([optional](#hover-settings 'Jump to the Hover settings'), on by default) @@ -418,7 +370,7 @@ An on-demand, [customizable](#gitlens-results-explorer-settings 'Jump to the Git #### Annotation Hovers

- Annotation Hovers + Annotation Hovers

- Adds [customizable](#hover-settings 'Jump to the Hover settings') Git blame hovers accessible when annotating @@ -426,7 +378,7 @@ An on-demand, [customizable](#gitlens-results-explorer-settings 'Jump to the Git ##### Details Hover

- Annotations Details Hover + Annotations Details Hover

- Adds a **details hover** annotation to each line while annotating to show more commit details ([optional](#hover-settings 'Jump to the Hover settings'), on by default) @@ -437,7 +389,7 @@ An on-demand, [customizable](#gitlens-results-explorer-settings 'Jump to the Git ##### Changes (diff) Hover

- Annotations Changes (diff) Hover + Annotations Changes (diff) Hover

- Adds a **changes (diff) hover** annotation to each line while annotating to show the line's previous version ([optional](#hover-settings 'Jump to the Hover settings'), on by default) @@ -461,7 +413,7 @@ An on-demand, [customizable](#gitlens-results-explorer-settings 'Jump to the Git ### Recent Changes

- Recent Changes + Recent Changes

- Adds an on-demand, [customizable](#recent-changes-settings 'Jump to the Recent Changes settings') and [themable](#themable-colors 'Jump to the Themable Colors'), **recent changes annotation** to highlight lines changed by the most recent commit @@ -473,7 +425,7 @@ An on-demand, [customizable](#gitlens-results-explorer-settings 'Jump to the Git ### Status Bar Blame

- Status Bar Blame + Status Bar Blame

- Adds a [customizable](#status-bar-settings 'Jump to the Status Bar Blame settings') **Git blame annotation** about the current line to the **status bar** ([optional](#status-bar-settings 'Jump to the Status Bar Blame settings'), on by default) @@ -502,7 +454,7 @@ An on-demand, [customizable](#gitlens-results-explorer-settings 'Jump to the Git - Use `#` to search for a commit with id of `` — See [Git docs](https://git-scm.com/docs/git-log 'Open Git docs') - Use `~` to search for commits with differences whose patch text contains added/removed lines that match `` — See [Git docs](https://git-scm.com/docs/git-log#git-log--Gltregexgt 'Open Git docs') - Use `=` to search for commits with differences that change the number of occurrences of the specified string (i.e. addition/deletion) in a file — See [Git docs](https://git-scm.com/docs/git-log#git-log--Sltstringgt 'Open Git docs') - - Provides a _Show in Results_ option to show the search results in the _GitLens Results_ explorer + - Provides a _Show in Results_ option to show the search results in the _Results_ explorer --- @@ -521,7 +473,7 @@ An on-demand, [customizable](#gitlens-results-explorer-settings 'Jump to the Git #### Branch History

- Branch History Quick Pick Menu + Branch History Quick Pick Menu

- Adds a _Show Current Branch History_ command (`gitlens.showQuickRepoHistory`) with a shortcut of `shift+alt+h` to show a paged **branch history quick pick menu** of the current branch for exploring its commit history @@ -536,7 +488,7 @@ An on-demand, [customizable](#gitlens-results-explorer-settings 'Jump to the Git #### File History

- File History Quick Pick Menu + File History Quick Pick Menu

- Adds a _Show File History_ command (`gitlens.showQuickFileHistory`) to show a paged **file history quick pick menu** of the current file for exploring its commit history @@ -547,7 +499,7 @@ An on-demand, [customizable](#gitlens-results-explorer-settings 'Jump to the Git #### Commit Details

- Commit Details Quick Pick Menu + Commit Details Quick Pick Menu

- Adds a _Show Commit Details_ command (`gitlens.showQuickCommitDetails`) to show a **commit details quick pick menu** of the most recent commit of the current file @@ -558,7 +510,7 @@ An on-demand, [customizable](#gitlens-results-explorer-settings 'Jump to the Git - Use the `alt+right arrow` shortcut on a file entry in the `Changed Files` section to preview the comparison of the current revision with the previous one

- Commit File Details Quick Pick Menu + Commit File Details Quick Pick Menu

- Adds a _Show Commit File Details_ command (`gitlens.showQuickCommitFileDetails`) with a shortcut of `alt+c` to show a **file commit details quick pick menu** of the most recent commit of the current file @@ -569,7 +521,7 @@ An on-demand, [customizable](#gitlens-results-explorer-settings 'Jump to the Git #### Repository Status

- Repository Status Quick Pick Menu + Repository Status Quick Pick Menu

- Adds a _Show Repository Status_ command (`gitlens.showQuickRepoStatus`) with a shortcut of `alt+s` to show a **repository status quick pick menu** for visualizing the current repository status @@ -584,7 +536,7 @@ An on-demand, [customizable](#gitlens-results-explorer-settings 'Jump to the Git #### Stashes

- Stashed Changes Quick Pick Menu + Stashed Changes Quick Pick Menu

- Adds a _Show Stashed Changes_ command (`gitlens.showQuickStashList`) to show a **stashed changes quick pick menu** for exploring your repository stash history @@ -598,7 +550,7 @@ An on-demand, [customizable](#gitlens-results-explorer-settings 'Jump to the Git #### Stash Details

- Stash Details Quick Pick Menu + Stash Details Quick Pick Menu

- Stashed changes show a **stash details quick pick menu** which is very similar to the **commit details quick pick menu** above @@ -683,64 +635,64 @@ GitLens is highly customizable and provides many configuration settings to allow | `gitlens.settings.mode` | Specifies the display mode of the interactive settings editor
`simple` - only displays common settings
`advanced` - displays all settings | | `gitlens.showWhatsNewAfterUpgrades` | Specifies whether to show What's New after upgrading to new feature releases | -### GitLens Explorer Settings +### Repositories Explorer Settings See also [Explorer Settings](#explorer-settings 'Jump to the Explorer settings') -| Name | Description | -| ---------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `gitlens.gitExplorer.autoRefresh` | Specifies whether to automatically refresh the _GitLens_ explorer when the repository or the file system changes | -| `gitlens.gitExplorer.branches.layout` | Specifies how the _GitLens_ explorer will display branches
`list` - displays branches as a list
`tree` - displays branches as a tree when branch names contain slashes `/` | -| `gitlens.gitExplorer.enabled` | Specifies whether to show the _GitLens_ explorer | -| `gitlens.gitExplorer.files.compact` | Specifies whether to compact (flatten) unnecessary file nesting in the _GitLens_ explorer
Only applies when `gitlens.gitExplorer.files.layout` is set to `tree` or `auto` | -| `gitlens.gitExplorer.files.layout` | Specifies how the _GitLens_ explorer will display files
`auto` - automatically switches between displaying files as a `tree` or `list` based on the `gitlens.gitExplorer.files.threshold` value and the number of files at each nesting level
`list` - displays files as a list
`tree` - displays files as a tree | -| `gitlens.gitExplorer.files.threshold` | Specifies when to switch between displaying files as a `tree` or `list` based on the number of files in a nesting level in the _GitLens_ explorer
Only applies when `gitlens.gitExplorer.files.layout` is set to `auto` | -| `gitlens.gitExplorer.includeWorkingTree` | Specifies whether to include working tree files inside the `Repository Status` node of the _GitLens_ explorer | -| `gitlens.gitExplorer.location` | Specifies where to show the _GitLens_ explorer
`gitlens` - adds to the GitLens view
`explorer` - adds to the Explorer view
`scm` - adds to the Source Control view | -| `gitlens.gitExplorer.showTrackingBranch` | Specifies whether to show the tracking branch when displaying local branches in the _GitLens_ explorer | +| Name | Description | +| ------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `gitlens.repositoriesExplorer.autoRefresh` | Specifies whether to automatically refresh the _Repositories_ explorer when the repository or the file system changes | +| `gitlens.repositoriesExplorer.branches.layout` | Specifies how the _Repositories_ explorer will display branches
`list` - displays branches as a list
`tree` - displays branches as a tree when branch names contain slashes `/` | +| `gitlens.repositoriesExplorer.enabled` | Specifies whether to show the _Repositories_ explorer | +| `gitlens.repositoriesExplorer.files.compact` | Specifies whether to compact (flatten) unnecessary file nesting in the _Repositories_ explorer
Only applies when `gitlens.repositoriesExplorer.files.layout` is set to `tree` or `auto` | +| `gitlens.repositoriesExplorer.files.layout` | Specifies how the _Repositories_ explorer will display files
`auto` - automatically switches between displaying files as a `tree` or `list` based on the `gitlens.repositoriesExplorer.files.threshold` value and the number of files at each nesting level
`list` - displays files as a list
`tree` - displays files as a tree | +| `gitlens.repositoriesExplorer.files.threshold` | Specifies when to switch between displaying files as a `tree` or `list` based on the number of files in a nesting level in the _Repositories_ explorer
Only applies when `gitlens.repositoriesExplorer.files.layout` is set to `auto` | +| `gitlens.repositoriesExplorer.includeWorkingTree` | Specifies whether to include working tree files inside the `Repository Status` node of the _Repositories_ explorer | +| `gitlens.repositoriesExplorer.location` | Specifies where to show the _Repositories_ explorer
`gitlens` - adds to the GitLens view
`explorer` - adds to the Explorer view
`scm` - adds to the Source Control view | +| `gitlens.repositoriesExplorer.showTrackingBranch` | Specifies whether to show the tracking branch when displaying local branches in the _Repositories_ explorer | -### GitLens File History Explorer Settings +### File History Explorer Settings See also [Explorer Settings](#explorer-settings 'Jump to the Explorer settings') -| Name | Description | -| -------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `gitlens.fileHistoryExplorer.avatars` | Specifies whether to show avatar images instead of status icons in the `GitLens File History` explorer | -| `gitlens.fileHistoryExplorer.enabled` | Specifies whether to show the _GitLens File History_ explorer | -| `gitlens.fileHistoryExplorer.location` | Specifies where to show the _GitLens File History_ explorer
`gitlens` - adds to the GitLens view
`explorer` - adds to the Explorer view
`scm` - adds to the Source Control view | +| Name | Description | +| -------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `gitlens.fileHistoryExplorer.avatars` | Specifies whether to show avatar images instead of status icons in the _File History_ explorer | +| `gitlens.fileHistoryExplorer.enabled` | Specifies whether to show the _File History_ explorer | +| `gitlens.fileHistoryExplorer.location` | Specifies where to show the _File History_ explorer
`gitlens` - adds to the GitLens view
`explorer` - adds to the Explorer view
`scm` - adds to the Source Control view | -### GitLens Line History Explorer Settings +### Line History Explorer Settings See also [Explorer Settings](#explorer-settings 'Jump to the Explorer settings') -| Name | Description | -| -------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `gitlens.fileHistoryExplorer.avatars` | Specifies whether to show avatar images instead of status icons in the `GitLens Line History` explorer | -| `gitlens.lineHistoryExplorer.enabled` | Specifies whether to show the _GitLens Line History_ explorer | -| `gitlens.lineHistoryExplorer.location` | Specifies where to show the _GitLens Line History_ explorer
`gitlens` - adds to the GitLens view
`explorer` - adds to the Explorer view
`scm` - adds to the Source Control view | +| Name | Description | +| -------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `gitlens.lineHistoryExplorer.avatars` | Specifies whether to show avatar images instead of status icons in the _Line History_ explorer | +| `gitlens.lineHistoryExplorer.enabled` | Specifies whether to show the _Line History_ explorer | +| `gitlens.lineHistoryExplorer.location` | Specifies where to show the _Line History_ explorer
`gitlens` - adds to the GitLens view
`explorer` - adds to the Explorer view
`scm` - adds to the Source Control view | -### GitLens Results Explorer Settings +### Results Explorer Settings See also [Explorer Settings](#explorer-settings 'Jump to the Explorer settings') -| Name | Description | -| ----------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `gitlens.resultsExplorer.files.compact` | Specifies whether to compact (flatten) unnecessary file nesting in the _GitLens Results_ explorer
Only applies when `gitlens.resultsExplorer.files.layout` is set to `tree` or `auto` | -| `gitlens.resultsExplorer.files.layout` | Specifies how the _GitLens Results_ explorer will display files
`auto` - automatically switches between displaying files as a `tree` or `list` based on the `gitlens.resultsExplorer.files.threshold` value and the number of files at each nesting level
`list` - displays files as a list
`tree` - displays files as a tree | -| `gitlens.resultsExplorer.files.threshold` | Specifies when to switch between displaying files as a `tree` or `list` based on the number of files in a nesting level in the _GitLens Results_ explorer
Only applies when `gitlens.resultsExplorer.files.layout` is set to `auto` | -| `gitlens.resultsExplorer.location` | Specifies where to show the _GitLens Results_ explorer
`gitlens` - adds to the GitLens view
`explorer` - adds to the Explorer view
`scm` - adds to the Source Control view | +| Name | Description | +| ----------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| `gitlens.resultsExplorer.files.compact` | Specifies whether to compact (flatten) unnecessary file nesting in the _Results_ explorer
Only applies when `gitlens.resultsExplorer.files.layout` is set to `tree` or `auto` | +| `gitlens.resultsExplorer.files.layout` | Specifies how the _Results_ explorer will display files
`auto` - automatically switches between displaying files as a `tree` or `list` based on the `gitlens.resultsExplorer.files.threshold` value and the number of files at each nesting level
`list` - displays files as a list
`tree` - displays files as a tree | +| `gitlens.resultsExplorer.files.threshold` | Specifies when to switch between displaying files as a `tree` or `list` based on the number of files in a nesting level in the _Results_ explorer
Only applies when `gitlens.resultsExplorer.files.layout` is set to `auto` | +| `gitlens.resultsExplorer.location` | Specifies where to show the _Results_ explorer
`gitlens` - adds to the GitLens view
`explorer` - adds to the Explorer view
`scm` - adds to the Source Control view | ### Explorer Settings -| Name | Description | -| ------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `gitlens.explorers.avatars` | Specifies whether to show avatar images instead of commit (or status) icons in the _GitLens_ and _GitLens Results_ explorers | -| `gitlens.explorers.commitFileFormat` | Specifies the format of a committed file in the _GitLens_ and _GitLens Results_ explorers
Available tokens
${directory} - directory name
${file} - file name
${filePath} - formatted file name and path
${path} - full file path | -| `gitlens.explorers.commitFormat` | Specifies the format of committed changes in the _GitLens_ and _GitLens Results_ explorers
Available tokens
${id} - commit id
${author} - commit author
${message} - commit message
${ago} - relative commit date (e.g. 1 day ago)
${date} - formatted commit date (format specified by `gitlens.statusBar.dateFormat`)
${agoOrDate} - commit date specified by `gitlens.defaultDateStyle`
${authorAgo} - commit author, relative commit date
${authorAgoOrDate} - commit author, commit date specified by `gitlens.defaultDateStyle`
See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting | -| `gitlens.explorers.defaultItemLimit` | Specifies the default number of items to show in an explorer list. Use 0 to specify no limit | -| `gitlens.explorers.stashFileFormat` | Specifies the format of a stashed file in the _GitLens_ and _GitLens Results_ explorers
Available tokens
${directory} - directory name
${file} - file name
${filePath} - formatted file name and path
${path} - full file path | -| `gitlens.explorers.stashFormat` | Specifies the format of stashed changes in the _GitLens_ and _GitLens Results_ explorers
Available tokens
${id} - commit id
${author} - commit author
${message} - commit message
${ago} - relative commit date (e.g. 1 day ago)
${date} - formatted commit date (format specified by `gitlens.statusBar.dateFormat`)
${agoOrDate} - commit date specified by `gitlens.defaultDateStyle`
${authorAgo} - commit author, relative commit date
${authorAgoOrDate} - commit author, commit date specified by `gitlens.defaultDateStyle`
See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting | -| `gitlens.explorers.statusFileFormat` | Specifies the format of the status of a working or committed file in the _GitLens_ and _GitLens Results_ explorers
Available tokens
${directory} - directory name
${file} - file name
${filePath} - formatted file name and path
${path} - full file path
${working} - optional indicator if the file is uncommitted | +| Name | Description | +| ------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `gitlens.explorers.avatars` | Specifies whether to show avatar images instead of commit (or status) icons in the _Repositories_ and _Results_ explorers | +| `gitlens.explorers.commitFileFormat` | Specifies the format of a committed file in the _Repositories_ and _Results_ explorers
Available tokens
${directory} - directory name
${file} - file name
${filePath} - formatted file name and path
${path} - full file path | +| `gitlens.explorers.commitFormat` | Specifies the format of committed changes in the _Repositories_ and _Results_ explorers
Available tokens
${id} - commit id
${author} - commit author
${message} - commit message
${ago} - relative commit date (e.g. 1 day ago)
${date} - formatted commit date (format specified by `gitlens.statusBar.dateFormat`)
${agoOrDate} - commit date specified by `gitlens.defaultDateStyle`
${authorAgo} - commit author, relative commit date
${authorAgoOrDate} - commit author, commit date specified by `gitlens.defaultDateStyle`
See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting | +| `gitlens.explorers.defaultItemLimit` | Specifies the default number of items to show in an explorer list. Use 0 to specify no limit | +| `gitlens.explorers.stashFileFormat` | Specifies the format of a stashed file in the _Repositories_ and _Results_ explorers
Available tokens
${directory} - directory name
${file} - file name
${filePath} - formatted file name and path
${path} - full file path | +| `gitlens.explorers.stashFormat` | Specifies the format of stashed changes in the _Repositories_ and _Results_ explorers
Available tokens
${id} - commit id
${author} - commit author
${message} - commit message
${ago} - relative commit date (e.g. 1 day ago)
${date} - formatted commit date (format specified by `gitlens.statusBar.dateFormat`)
${agoOrDate} - commit date specified by `gitlens.defaultDateStyle`
${authorAgo} - commit author, relative commit date
${authorAgoOrDate} - commit author, commit date specified by `gitlens.defaultDateStyle`
See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting | +| `gitlens.explorers.statusFileFormat` | Specifies the format of the status of a working or committed file in the _Repositories_ and _Results_ explorers
Available tokens
${directory} - directory name
${file} - file name
${filePath} - formatted file name and path
${path} - full file path
${working} - optional indicator if the file is uncommitted | ### Code Lens Settings diff --git a/images/chat-badge.png b/images/chat-badge.png deleted file mode 100644 index 9fe10b7..0000000 Binary files a/images/chat-badge.png and /dev/null differ diff --git a/images/chat-badge.svg b/images/chat-badge.svg deleted file mode 100644 index f294863..0000000 --- a/images/chat-badge.svg +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - chat - chat - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/images/cl-annotation-format.png b/images/cl-annotation-format.png deleted file mode 100644 index a0fa00a..0000000 Binary files a/images/cl-annotation-format.png and /dev/null differ diff --git a/images/cl-annotations-toggle.png b/images/cl-annotations-toggle.png deleted file mode 100644 index 8f6ccf1..0000000 Binary files a/images/cl-annotations-toggle.png and /dev/null differ diff --git a/images/cl-branch-upstream-indicator.png b/images/cl-branch-upstream-indicator.png deleted file mode 100644 index 5a8e46f..0000000 Binary files a/images/cl-branch-upstream-indicator.png and /dev/null differ diff --git a/images/cl-current-line-scrollable.png b/images/cl-current-line-scrollable.png deleted file mode 100644 index b77bc26..0000000 Binary files a/images/cl-current-line-scrollable.png and /dev/null differ diff --git a/images/cl-general-settings.png b/images/cl-general-settings.png deleted file mode 100644 index ecf6310..0000000 Binary files a/images/cl-general-settings.png and /dev/null differ diff --git a/images/cl-heatmap-cold.png b/images/cl-heatmap-cold.png deleted file mode 100644 index dbd1ab7..0000000 Binary files a/images/cl-heatmap-cold.png and /dev/null differ diff --git a/images/cl-issue-linking.png b/images/cl-issue-linking.png deleted file mode 100644 index 4f5981c..0000000 Binary files a/images/cl-issue-linking.png and /dev/null differ diff --git a/images/cl-menu-settings.png b/images/cl-menu-settings.png deleted file mode 100644 index f863512..0000000 Binary files a/images/cl-menu-settings.png and /dev/null differ diff --git a/images/cl-mode-switch.png b/images/cl-mode-switch.png deleted file mode 100644 index 8a51c7c..0000000 Binary files a/images/cl-mode-switch.png and /dev/null differ diff --git a/images/cl-modes-settings.png b/images/cl-modes-settings.png deleted file mode 100644 index 4336558..0000000 Binary files a/images/cl-modes-settings.png and /dev/null differ diff --git a/images/cl-rich-tooltips.png b/images/cl-rich-tooltips.png deleted file mode 100644 index bdd1eae..0000000 Binary files a/images/cl-rich-tooltips.png and /dev/null differ diff --git a/images/cl-settings-mode.png b/images/cl-settings-mode.png deleted file mode 100644 index 3ec488d..0000000 Binary files a/images/cl-settings-mode.png and /dev/null differ diff --git a/images/cl-status-bar-reduce-flashing.png b/images/cl-status-bar-reduce-flashing.png deleted file mode 100644 index fb7aded..0000000 Binary files a/images/cl-status-bar-reduce-flashing.png and /dev/null differ diff --git a/images/cl-welcome.png b/images/cl-welcome.png deleted file mode 100644 index 1bec036..0000000 Binary files a/images/cl-welcome.png and /dev/null differ diff --git a/images/ss-code-lens.png b/images/docs/code-lens.png similarity index 100% rename from images/ss-code-lens.png rename to images/docs/code-lens.png diff --git a/images/ss-current-line-blame.png b/images/docs/current-line-blame.png similarity index 100% rename from images/ss-current-line-blame.png rename to images/docs/current-line-blame.png diff --git a/images/cl-history-explorer.png b/images/docs/file-history-explorer.png similarity index 100% rename from images/cl-history-explorer.png rename to images/docs/file-history-explorer.png diff --git a/images/gitlens-logo-dark.png b/images/docs/gitlens-logo-dark.png similarity index 100% rename from images/gitlens-logo-dark.png rename to images/docs/gitlens-logo-dark.png diff --git a/images/gitlens-logo.pdn b/images/docs/gitlens-logo.pdn similarity index 100% rename from images/gitlens-logo.pdn rename to images/docs/gitlens-logo.pdn diff --git a/images/gitlens-logo.png b/images/docs/gitlens-logo.png similarity index 100% rename from images/gitlens-logo.png rename to images/docs/gitlens-logo.png diff --git a/images/gitlens-preview.gif b/images/docs/gitlens-preview.gif similarity index 100% rename from images/gitlens-preview.gif rename to images/docs/gitlens-preview.gif diff --git a/images/ss-gutter-blame.png b/images/docs/gutter-blame.png similarity index 100% rename from images/ss-gutter-blame.png rename to images/docs/gutter-blame.png diff --git a/images/ss-heatmap.png b/images/docs/heatmap.png similarity index 100% rename from images/ss-heatmap.png rename to images/docs/heatmap.png diff --git a/images/ss-hovers-annotations-changes.png b/images/docs/hovers-annotations-changes.png similarity index 100% rename from images/ss-hovers-annotations-changes.png rename to images/docs/hovers-annotations-changes.png diff --git a/images/ss-hovers-annotations-details.png b/images/docs/hovers-annotations-details.png similarity index 100% rename from images/ss-hovers-annotations-details.png rename to images/docs/hovers-annotations-details.png diff --git a/images/ss-hovers-annotations.png b/images/docs/hovers-annotations.png similarity index 100% rename from images/ss-hovers-annotations.png rename to images/docs/hovers-annotations.png diff --git a/images/ss-hovers-current-line-changes.png b/images/docs/hovers-current-line-changes.png similarity index 100% rename from images/ss-hovers-current-line-changes.png rename to images/docs/hovers-current-line-changes.png diff --git a/images/ss-hovers-current-line-details.png b/images/docs/hovers-current-line-details.png similarity index 100% rename from images/ss-hovers-current-line-details.png rename to images/docs/hovers-current-line-details.png diff --git a/images/ss-hovers-current-line.png b/images/docs/hovers-current-line.png similarity index 100% rename from images/ss-hovers-current-line.png rename to images/docs/hovers-current-line.png diff --git a/images/ss-menu-branch-history.png b/images/docs/menu-branch-history.png similarity index 100% rename from images/ss-menu-branch-history.png rename to images/docs/menu-branch-history.png diff --git a/images/ss-menu-commit-details.png b/images/docs/menu-commit-details.png similarity index 100% rename from images/ss-menu-commit-details.png rename to images/docs/menu-commit-details.png diff --git a/images/ss-menu-commit-file-details.png b/images/docs/menu-commit-file-details.png similarity index 100% rename from images/ss-menu-commit-file-details.png rename to images/docs/menu-commit-file-details.png diff --git a/images/ss-menu-file-history.png b/images/docs/menu-file-history.png similarity index 100% rename from images/ss-menu-file-history.png rename to images/docs/menu-file-history.png diff --git a/images/ss-menu-repo-status.png b/images/docs/menu-repo-status.png similarity index 100% rename from images/ss-menu-repo-status.png rename to images/docs/menu-repo-status.png diff --git a/images/ss-menu-stash-details.png b/images/docs/menu-stash-details.png similarity index 100% rename from images/ss-menu-stash-details.png rename to images/docs/menu-stash-details.png diff --git a/images/ss-menu-stash-list.png b/images/docs/menu-stash-list.png similarity index 100% rename from images/ss-menu-stash-list.png rename to images/docs/menu-stash-list.png diff --git a/images/ss-recent-changes.png b/images/docs/recent-changes.png similarity index 100% rename from images/ss-recent-changes.png rename to images/docs/recent-changes.png diff --git a/images/ss-gitlens-explorer-repository.png b/images/docs/repositories-explorer.png similarity index 100% rename from images/ss-gitlens-explorer-repository.png rename to images/docs/repositories-explorer.png diff --git a/images/ss-gitlens-results.png b/images/docs/results-explorer.png similarity index 100% rename from images/ss-gitlens-results.png rename to images/docs/results-explorer.png diff --git a/images/cl-settings.png b/images/docs/settings.png similarity index 100% rename from images/cl-settings.png rename to images/docs/settings.png diff --git a/images/ss-status-bar.png b/images/docs/status-bar.png similarity index 100% rename from images/ss-status-bar.png rename to images/docs/status-bar.png diff --git a/images/git-icon.svg b/images/git-icon.svg deleted file mode 100644 index 9b16645..0000000 --- a/images/git-icon.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/images/git.svg b/images/git.svg deleted file mode 100644 index ae1b3e1..0000000 --- a/images/git.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/images/gitlens-preview-full.gif b/images/gitlens-preview-full.gif deleted file mode 100644 index 6253397..0000000 Binary files a/images/gitlens-preview-full.gif and /dev/null differ diff --git a/images/gitlens-preview1.gif b/images/gitlens-preview1.gif deleted file mode 100644 index 9866600..0000000 Binary files a/images/gitlens-preview1.gif and /dev/null differ diff --git a/images/gitlens-preview2.gif b/images/gitlens-preview2.gif deleted file mode 100644 index b22b19e..0000000 Binary files a/images/gitlens-preview2.gif and /dev/null differ diff --git a/images/ss-gitlens-explorer-history.png b/images/ss-gitlens-explorer-history.png deleted file mode 100644 index e4db7d4..0000000 Binary files a/images/ss-gitlens-explorer-history.png and /dev/null differ diff --git a/images/ss-gitlens-history-explorer.png b/images/ss-gitlens-history-explorer.png deleted file mode 100644 index 70ce7aa..0000000 Binary files a/images/ss-gitlens-history-explorer.png and /dev/null differ diff --git a/package.json b/package.json index 69955a6..dea07d3 100644 --- a/package.json +++ b/package.json @@ -440,19 +440,19 @@ "gitlens.explorers.avatars": { "type": "boolean", "default": true, - "description": "Specifies whether to show avatar images instead of commit (or status) icons in the `GitLens` and `GitLens Results` explorers", + "description": "Specifies whether to show avatar images instead of commit (or status) icons in the `Repositories` and `Results` explorers", "scope": "window" }, "gitlens.explorers.commitFileFormat": { "type": "string", "default": "${filePath}", - "description": "Specifies the format of a committed file in the `GitLens` and `GitLens Results` explorers\nAvailable tokens\n ${directory} - directory name\n ${file} - file name\n ${filePath} - formatted file name and path\n ${path} - full file path", + "description": "Specifies the format of a committed file in the `Repositories` and `Results` explorers\nAvailable tokens\n ${directory} - directory name\n ${file} - file name\n ${filePath} - formatted file name and path\n ${path} - full file path", "scope": "window" }, "gitlens.explorers.commitFormat": { "type": "string", "default": "${message} • ${authorAgoOrDate}${ (id)}", - "description": "Specifies the format of committed changes in the `GitLens` and `GitLens Results` explorers\nAvailable tokens\n ${id} - commit id\n ${author} - commit author\n ${message} - commit message\n ${ago} - relative commit date (e.g. 1 day ago)\n ${date} - formatted commit date (format specified by `gitlens.defaultDateFormat`)\\n ${agoOrDate} - commit date specified by `gitlens.defaultDateStyle`\n ${authorAgo} - commit author, relative commit date\n ${authorAgoOrDate} - commit author, commit date specified by `gitlens.defaultDateStyle`\nSee https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting", + "description": "Specifies the format of committed changes in the `Repositories` and `Results` explorers\nAvailable tokens\n ${id} - commit id\n ${author} - commit author\n ${message} - commit message\n ${ago} - relative commit date (e.g. 1 day ago)\n ${date} - formatted commit date (format specified by `gitlens.defaultDateFormat`)\\n ${agoOrDate} - commit date specified by `gitlens.defaultDateStyle`\n ${authorAgo} - commit author, relative commit date\n ${authorAgoOrDate} - commit author, commit date specified by `gitlens.defaultDateStyle`\nSee https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting", "scope": "window" }, "gitlens.explorers.defaultItemLimit": { @@ -464,28 +464,28 @@ "gitlens.explorers.stashFileFormat": { "type": "string", "default": "${filePath}", - "description": "Specifies the format of a stashed file in the `GitLens` and `GitLens Results` explorers\nAvailable tokens\n ${directory} - directory name\n ${file} - file name\n ${filePath} - formatted file name and path\n ${path} - full file path", + "description": "Specifies the format of a stashed file in the `Repositories` and `Results` explorers\nAvailable tokens\n ${directory} - directory name\n ${file} - file name\n ${filePath} - formatted file name and path\n ${path} - full file path", "scope": "window" }, "gitlens.explorers.stashFormat": { "type": "string", "default": "${message}", - "description": "Specifies the format of stashed changes in the `GitLens` and `GitLens Results` explorers\nAvailable tokens\n ${id} - commit id\n ${author} - commit author\n ${message} - commit message\n ${ago} - relative commit date (e.g. 1 day ago)\n ${date} - formatted commit date (format specified by `gitlens.statusBar.dateFormat`)\n ${agoOrDate} - commit date specified by `gitlens.defaultDateStyle`\n ${authorAgo} - commit author, relative commit date\n ${authorAgoOrDate} - commit author, commit date specified by `gitlens.defaultDateStyle`\nSee https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting", + "description": "Specifies the format of stashed changes in the `Repositories` and `Results` explorers\nAvailable tokens\n ${id} - commit id\n ${author} - commit author\n ${message} - commit message\n ${ago} - relative commit date (e.g. 1 day ago)\n ${date} - formatted commit date (format specified by `gitlens.statusBar.dateFormat`)\n ${agoOrDate} - commit date specified by `gitlens.defaultDateStyle`\n ${authorAgo} - commit author, relative commit date\n ${authorAgoOrDate} - commit author, commit date specified by `gitlens.defaultDateStyle`\nSee https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting", "scope": "window" }, "gitlens.explorers.statusFileFormat": { "type": "string", "default": "${working }${filePath}", - "description": "Specifies the format of the status of a working or committed file in the `GitLens` and `GitLens Results` explorers\nAvailable tokens\n ${directory} - directory name\n ${file} - file name\n ${filePath} - formatted file name and path\n ${path} - full file path\n ${working} - optional indicator if the file is uncommitted", + "description": "Specifies the format of the status of a working or committed file in the `Repositories` and `Results` explorers\nAvailable tokens\n ${directory} - directory name\n ${file} - file name\n ${filePath} - formatted file name and path\n ${path} - full file path\n ${working} - optional indicator if the file is uncommitted", "scope": "window" }, - "gitlens.gitExplorer.autoRefresh": { + "gitlens.repositoriesExplorer.autoRefresh": { "type": "boolean", "default": true, - "description": "Specifies whether to automatically refresh the `GitLens` explorer when the repository or the file system changes", + "description": "Specifies whether to automatically refresh the `Repositories` explorer when the repository or the file system changes", "scope": "window" }, - "gitlens.gitExplorer.branches.layout": { + "gitlens.repositoriesExplorer.branches.layout": { "type": "string", "default": "tree", "enum": [ @@ -496,22 +496,22 @@ "Displays branches as a list", "Displays branches as a tree when branch names contain slashes `/`" ], - "description": "Specifies how the `GitLens` explorer will display branches", + "description": "Specifies how the `Repositories` explorer will display branches", "scope": "window" }, - "gitlens.gitExplorer.enabled": { + "gitlens.repositoriesExplorer.enabled": { "type": "boolean", "default": true, - "description": "Specifies whether to show the `GitLens` explorer", + "description": "Specifies whether to show the `Repositories` explorer", "scope": "window" }, - "gitlens.gitExplorer.files.compact": { + "gitlens.repositoriesExplorer.files.compact": { "type": "boolean", "default": true, - "description": "Specifies whether to compact (flatten) unnecessary file nesting in the `GitLens` explorer\nOnly applies when `#gitlens.gitExplorer.files.layout#` is set to `tree` or `auto`", + "description": "Specifies whether to compact (flatten) unnecessary file nesting in the `Repositories` explorer\nOnly applies when `#gitlens.repositoriesExplorer.files.layout#` is set to `tree` or `auto`", "scope": "window" }, - "gitlens.gitExplorer.files.layout": { + "gitlens.repositoriesExplorer.files.layout": { "type": "string", "default": "auto", "enum": [ @@ -520,26 +520,26 @@ "tree" ], "enumDescriptions": [ - "Automatically switches between displaying files as a `tree` or `list` based on the `#gitlens.gitExplorer.files.threshold#` value and the number of files at each nesting level", + "Automatically switches between displaying files as a `tree` or `list` based on the `#gitlens.repositoriesExplorer.files.threshold#` value and the number of files at each nesting level", "Displays files as a list", "Displays files as a tree" ], - "description": "Specifies how the `GitLens` explorer will display files", + "description": "Specifies how the `Repositories` explorer will display files", "scope": "window" }, - "gitlens.gitExplorer.files.threshold": { + "gitlens.repositoriesExplorer.files.threshold": { "type": "number", "default": 5, - "description": "Specifies when to switch between displaying files as a `tree` or `list` based on the number of files in a nesting level in the `GitLens` explorer\nOnly applies when `#gitlens.gitExplorer.files.layout#` is set to `auto`", + "description": "Specifies when to switch between displaying files as a `tree` or `list` based on the number of files in a nesting level in the `Repositories` explorer\nOnly applies when `#gitlens.repositoriesExplorer.files.layout#` is set to `auto`", "scope": "window" }, - "gitlens.gitExplorer.includeWorkingTree": { + "gitlens.repositoriesExplorer.includeWorkingTree": { "type": "boolean", "default": true, - "description": "Specifies whether to include working tree files inside the `Repository Status` node of the `GitLens` explorer", + "description": "Specifies whether to include working tree files inside the `Repository Status` node of the `Repositories` explorer", "scope": "window" }, - "gitlens.gitExplorer.location": { + "gitlens.repositoriesExplorer.location": { "type": "string", "default": "gitlens", "enum": [ @@ -552,13 +552,13 @@ "Adds to the Explorer view", "Adds to the Source Control view" ], - "description": "Specifies where to show the `GitLens` explorer", + "description": "Specifies where to show the `Repositories` explorer", "scope": "window" }, - "gitlens.gitExplorer.showTrackingBranch": { + "gitlens.repositoriesExplorer.showTrackingBranch": { "type": "boolean", "default": true, - "description": "Specifies whether to show the tracking branch when displaying local branches in the `GitLens` explorer", + "description": "Specifies whether to show the tracking branch when displaying local branches in the `Repositories` explorer", "scope": "window" }, "gitlens.heatmap.ageThreshold": { @@ -596,13 +596,13 @@ "gitlens.fileHistoryExplorer.avatars": { "type": "boolean", "default": true, - "description": "Specifies whether to show avatar images instead of status icons in the `GitLens File History` explorer", + "description": "Specifies whether to show avatar images instead of status icons in the `File History` explorer", "scope": "window" }, "gitlens.fileHistoryExplorer.enabled": { "type": "boolean", "default": true, - "description": "Specifies whether to show the `GitLens File History` explorer", + "description": "Specifies whether to show the `File History` explorer", "scope": "window" }, "gitlens.fileHistoryExplorer.location": { @@ -618,7 +618,7 @@ "Adds to the Explorer view", "Adds to the Source Control view" ], - "description": "Specifies where to show the `GitLens File History` explorer", + "description": "Specifies where to show the `File History` explorer", "scope": "window" }, "gitlens.hovers.annotations.changes": { @@ -722,13 +722,13 @@ "gitlens.lineHistoryExplorer.avatars": { "type": "boolean", "default": true, - "description": "Specifies whether to show avatar images instead of status icons in the `GitLens Line History` explorer", + "description": "Specifies whether to show avatar images instead of status icons in the `Line History` explorer", "scope": "window" }, "gitlens.lineHistoryExplorer.enabled": { "type": "boolean", "default": true, - "description": "Specifies whether to show the `GitLens Line History` explorer", + "description": "Specifies whether to show the `Line History` explorer", "scope": "window" }, "gitlens.lineHistoryExplorer.location": { @@ -744,7 +744,7 @@ "Adds to the Explorer view", "Adds to the Source Control view" ], - "description": "Specifies where to show the `GitLens Line History` explorer", + "description": "Specifies where to show the `Line History` explorer", "scope": "window" }, "gitlens.menus": { @@ -1188,7 +1188,7 @@ "gitlens.resultsExplorer.files.compact": { "type": "boolean", "default": true, - "description": "Specifies whether to compact (flatten) unnecessary file nesting in the `GitLens Results` explorer\nOnly applies when `#gitlens.resultsExplorer.files.layout#` is set to `tree` or `auto`", + "description": "Specifies whether to compact (flatten) unnecessary file nesting in the `Results` explorer\nOnly applies when `#gitlens.resultsExplorer.files.layout#` is set to `tree` or `auto`", "scope": "window" }, "gitlens.resultsExplorer.files.layout": { @@ -1200,17 +1200,17 @@ "tree" ], "enumDescriptions": [ - "Automatically switches between displaying files as a `tree` or `list` based on the `#gitlens.gitExplorer.files.threshold#` value and the number of files at each nesting level", + "Automatically switches between displaying files as a `tree` or `list` based on the `#gitlens.repositoriesExplorer.files.threshold#` value and the number of files at each nesting level", "Displays files as a list", "Displays files as a tree" ], - "description": "Specifies how the `GitLens Results` explorer will display files", + "description": "Specifies how the `Results` explorer will display files", "scope": "window" }, "gitlens.resultsExplorer.files.threshold": { "type": "number", "default": 5, - "description": "Specifies when to switch between displaying files as a `tree` or `list` based on the number of files in a nesting level in the `GitLens Results` explorer\nOnly applies when `#gitlens.resultsExplorer.files.layout#` is set to `auto`", + "description": "Specifies when to switch between displaying files as a `tree` or `list` based on the number of files in a nesting level in the `Results` explorer\nOnly applies when `#gitlens.resultsExplorer.files.layout#` is set to `auto`", "scope": "window" }, "gitlens.resultsExplorer.location": { @@ -1226,7 +1226,7 @@ "Adds to the Explorer view", "Adds to the Source Control view" ], - "description": "Specifies where to show the `GitLens Results` explorer", + "description": "Specifies where to show the `Results` explorer", "scope": "window" }, "gitlens.settings.mode": { @@ -1516,11 +1516,6 @@ "category": "GitLens" }, { - "command": "gitlens.showGitExplorer", - "title": "Show GitLens Explorer", - "category": "GitLens" - }, - { "command": "gitlens.showFileHistoryExplorer", "title": "Show File History Explorer", "category": "GitLens" @@ -1531,6 +1526,11 @@ "category": "GitLens" }, { + "command": "gitlens.showRepositoriesExplorer", + "title": "Show Repositories Explorer", + "category": "GitLens" + }, + { "command": "gitlens.showResultsExplorer", "title": "Show Results Explorer", "category": "GitLens" @@ -1829,7 +1829,7 @@ "category": "GitLens" }, { - "command": "gitlens.gitExplorer.fetchAll", + "command": "gitlens.repositoriesExplorer.fetchAll", "title": "Fetch Repositories", "category": "GitLens", "icon": { @@ -2044,7 +2044,7 @@ "category": "GitLens" }, { - "command": "gitlens.gitExplorer.refresh", + "command": "gitlens.repositoriesExplorer.refresh", "title": "Refresh", "category": "GitLens", "icon": { @@ -2053,32 +2053,32 @@ } }, { - "command": "gitlens.gitExplorer.refreshNode", + "command": "gitlens.repositoriesExplorer.refreshNode", "title": "Refresh", "category": "GitLens" }, { - "command": "gitlens.gitExplorer.setFilesLayoutToAuto", + "command": "gitlens.repositoriesExplorer.setFilesLayoutToAuto", "title": "Automatic Layout", "category": "GitLens" }, { - "command": "gitlens.gitExplorer.setFilesLayoutToList", + "command": "gitlens.repositoriesExplorer.setFilesLayoutToList", "title": "List Layout", "category": "GitLens" }, { - "command": "gitlens.gitExplorer.setFilesLayoutToTree", + "command": "gitlens.repositoriesExplorer.setFilesLayoutToTree", "title": "Tree Layout", "category": "GitLens" }, { - "command": "gitlens.gitExplorer.setAutoRefreshToOn", + "command": "gitlens.repositoriesExplorer.setAutoRefreshToOn", "title": "Enable Automatic Refresh", "category": "GitLens" }, { - "command": "gitlens.gitExplorer.setAutoRefreshToOff", + "command": "gitlens.repositoriesExplorer.setAutoRefreshToOff", "title": "Disable Automatic Refresh", "category": "GitLens" }, @@ -2208,8 +2208,8 @@ "menus": { "commandPalette": [ { - "command": "gitlens.showGitExplorer", - "when": "gitlens:enabled && gitlens:gitExplorer" + "command": "gitlens.showRepositoriesExplorer", + "when": "gitlens:enabled && gitlens:repositoriesExplorer" }, { "command": "gitlens.showFileHistoryExplorer", @@ -2421,7 +2421,7 @@ "when": "false" }, { - "command": "gitlens.gitExplorer.fetchAll", + "command": "gitlens.repositoriesExplorer.fetchAll", "when": "false" }, { @@ -2577,31 +2577,31 @@ "when": "false" }, { - "command": "gitlens.gitExplorer.refresh", + "command": "gitlens.repositoriesExplorer.refresh", "when": "false" }, { - "command": "gitlens.gitExplorer.refreshNode", + "command": "gitlens.repositoriesExplorer.refreshNode", "when": "false" }, { - "command": "gitlens.gitExplorer.setFilesLayoutToAuto", + "command": "gitlens.repositoriesExplorer.setFilesLayoutToAuto", "when": "false" }, { - "command": "gitlens.gitExplorer.setFilesLayoutToList", + "command": "gitlens.repositoriesExplorer.setFilesLayoutToList", "when": "false" }, { - "command": "gitlens.gitExplorer.setFilesLayoutToTree", + "command": "gitlens.repositoriesExplorer.setFilesLayoutToTree", "when": "false" }, { - "command": "gitlens.gitExplorer.setAutoRefreshToOn", + "command": "gitlens.repositoriesExplorer.setAutoRefreshToOn", "when": "false" }, { - "command": "gitlens.gitExplorer.setAutoRefreshToOff", + "command": "gitlens.repositoriesExplorer.setAutoRefreshToOff", "when": "false" }, { @@ -2910,42 +2910,42 @@ "view/title": [ { "command": "gitlens.showCommitSearch", - "when": "view =~ /^gitlens.gitExplorer:/", + "when": "view =~ /^gitlens.repositoriesExplorer:/", "group": "navigation@1" }, { - "command": "gitlens.gitExplorer.fetchAll", - "when": "view =~ /^gitlens.gitExplorer:/", + "command": "gitlens.repositoriesExplorer.fetchAll", + "when": "view =~ /^gitlens.repositoriesExplorer:/", "group": "navigation@7" }, { - "command": "gitlens.gitExplorer.refresh", - "when": "view =~ /^gitlens.gitExplorer:/", + "command": "gitlens.repositoriesExplorer.refresh", + "when": "view =~ /^gitlens.repositoriesExplorer:/", "group": "navigation@8" }, { - "command": "gitlens.gitExplorer.setFilesLayoutToAuto", - "when": "view =~ /^gitlens.gitExplorer:/", + "command": "gitlens.repositoriesExplorer.setFilesLayoutToAuto", + "when": "view =~ /^gitlens.repositoriesExplorer:/", "group": "1_gitlens" }, { - "command": "gitlens.gitExplorer.setFilesLayoutToList", - "when": "view =~ /^gitlens.gitExplorer:/", + "command": "gitlens.repositoriesExplorer.setFilesLayoutToList", + "when": "view =~ /^gitlens.repositoriesExplorer:/", "group": "1_gitlens" }, { - "command": "gitlens.gitExplorer.setFilesLayoutToTree", - "when": "view =~ /^gitlens.gitExplorer:/", + "command": "gitlens.repositoriesExplorer.setFilesLayoutToTree", + "when": "view =~ /^gitlens.repositoriesExplorer:/", "group": "1_gitlens" }, { - "command": "gitlens.gitExplorer.setAutoRefreshToOn", - "when": "view =~ /^gitlens.gitExplorer:/ && config.gitlens.gitExplorer.autoRefresh && !gitlens:gitExplorer:autoRefresh", + "command": "gitlens.repositoriesExplorer.setAutoRefreshToOn", + "when": "view =~ /^gitlens.repositoriesExplorer:/ && config.gitlens.repositoriesExplorer.autoRefresh && !gitlens:repositoriesExplorer:autoRefresh", "group": "2_gitlens" }, { - "command": "gitlens.gitExplorer.setAutoRefreshToOff", - "when": "view =~ /^gitlens.gitExplorer:/ && config.gitlens.gitExplorer.autoRefresh && gitlens:gitExplorer:autoRefresh", + "command": "gitlens.repositoriesExplorer.setAutoRefreshToOff", + "when": "view =~ /^gitlens.repositoriesExplorer:/ && config.gitlens.repositoriesExplorer.autoRefresh && gitlens:repositoriesExplorer:autoRefresh", "group": "2_gitlens" }, { @@ -3336,8 +3336,8 @@ "group": "8_gitlens" }, { - "command": "gitlens.gitExplorer.refreshNode", - "when": "view =~ /^gitlens.gitExplorer:/ && viewItem =~ /gitlens:(?!file\\b)/", + "command": "gitlens.repositoriesExplorer.refreshNode", + "when": "view =~ /^gitlens.repositoriesExplorer:/ && viewItem =~ /gitlens:(?!file\\b)/", "group": "9_gitlens@1" }, { @@ -3556,9 +3556,9 @@ "views": { "gitlens": [ { - "id": "gitlens.gitExplorer:gitlens", + "id": "gitlens.repositoriesExplorer:gitlens", "name": "Repositories", - "when": "gitlens:enabled && gitlens:gitExplorer == gitlens" + "when": "gitlens:enabled && gitlens:repositoriesExplorer == gitlens" }, { "id": "gitlens.fileHistoryExplorer:gitlens", @@ -3578,9 +3578,9 @@ ], "explorer": [ { - "id": "gitlens.gitExplorer:explorer", - "name": "GitLens", - "when": "gitlens:enabled && gitlens:gitExplorer == explorer" + "id": "gitlens.repositoriesExplorer:explorer", + "name": "GitLens Repositories", + "when": "gitlens:enabled && gitlens:repositoriesExplorer == explorer" }, { "id": "gitlens.fileHistoryExplorer:explorer", @@ -3589,7 +3589,7 @@ }, { "id": "gitlens.lineHistoryExplorer:explorer", - "name": "Line History", + "name": "GitLens Line History", "when": "gitlens:enabled && gitlens:lineHistoryExplorer == explorer" }, { @@ -3600,9 +3600,9 @@ ], "scm": [ { - "id": "gitlens.gitExplorer:scm", - "name": "GitLens", - "when": "gitlens:enabled && gitlens:gitExplorer == scm" + "id": "gitlens.repositoriesExplorer:scm", + "name": "GitLens Repositories", + "when": "gitlens:enabled && gitlens:repositoriesExplorer == scm" }, { "id": "gitlens.fileHistoryExplorer:scm", @@ -3611,7 +3611,7 @@ }, { "id": "gitlens.lineHistoryExplorer:scm", - "name": "Line History", + "name": "GitLens Line History", "when": "gitlens:enabled && gitlens:lineHistoryExplorer == scm" }, { diff --git a/src/codelens/codeLensProvider.ts b/src/codelens/codeLensProvider.ts index ebd74bb..c1affc3 100644 --- a/src/codelens/codeLensProvider.ts +++ b/src/codelens/codeLensProvider.ts @@ -26,10 +26,10 @@ import { } from '../commands'; import { CodeLensCommand, + CodeLensConfig, CodeLensLanguageScope, CodeLensScopes, - configuration, - ICodeLensConfig + configuration } from '../configuration'; import { BuiltInCommands, DocumentSchemes } from '../constants'; import { Container } from '../container'; @@ -117,7 +117,7 @@ export class GitCodeLensProvider implements CodeLensProvider { } } - const cfg = configuration.get(configuration.name('codeLens').value, document.uri); + const cfg = configuration.get(configuration.name('codeLens').value, document.uri); let languageScope = cfg.scopesByLanguage && @@ -353,7 +353,7 @@ export class GitCodeLensProvider implements CodeLensProvider { documentRangeFn: () => Range, blame: GitBlame | undefined, gitUri: GitUri | undefined, - cfg: ICodeLensConfig, + cfg: CodeLensConfig, dirty: boolean, dirtyCommand: Command | undefined ): void { @@ -627,7 +627,7 @@ export class GitCodeLensProvider implements CodeLensProvider { return lens; } - private getDirtyTitle(cfg: ICodeLensConfig) { + private getDirtyTitle(cfg: CodeLensConfig) { if (cfg.recentChange.enabled && cfg.authors.enabled) { return Container.config.strings.codeLens.unsavedChanges.recentChangeAndAuthors; } diff --git a/src/commands/common.ts b/src/commands/common.ts index 595976f..ad81ed0 100644 --- a/src/commands/common.ts +++ b/src/commands/common.ts @@ -55,7 +55,6 @@ export enum Commands { OpenWorkingFile = 'gitlens.openWorkingFile', ResetSuppressedWarnings = 'gitlens.resetSuppressedWarnings', ShowCommitSearch = 'gitlens.showCommitSearch', - ShowGitExplorer = 'gitlens.showGitExplorer', ShowFileHistoryExplorer = 'gitlens.showFileHistoryExplorer', ShowLineHistoryExplorer = 'gitlens.showLineHistoryExplorer', ShowLastQuickPick = 'gitlens.showLastQuickPick', @@ -66,6 +65,7 @@ export enum Commands { ShowQuickCurrentBranchHistory = 'gitlens.showQuickRepoHistory', ShowQuickRepoStatus = 'gitlens.showQuickRepoStatus', ShowQuickStashList = 'gitlens.showQuickStashList', + ShowRepositoriesExplorer = 'gitlens.showRepositoriesExplorer', ShowResultsExplorer = 'gitlens.showResultsExplorer', ShowSettingsPage = 'gitlens.showSettingsPage', ShowWelcomePage = 'gitlens.showWelcomePage', diff --git a/src/commands/showExplorer.ts b/src/commands/showExplorer.ts index e110521..a9d359a 100644 --- a/src/commands/showExplorer.ts +++ b/src/commands/showExplorer.ts @@ -5,7 +5,7 @@ import { Command, CommandContext, Commands } from './common'; export class ShowExplorerCommand extends Command { constructor() { super([ - Commands.ShowGitExplorer, + Commands.ShowRepositoriesExplorer, Commands.ShowFileHistoryExplorer, Commands.ShowLineHistoryExplorer, Commands.ShowResultsExplorer @@ -18,8 +18,8 @@ export class ShowExplorerCommand extends Command { execute(command: Commands) { switch (command) { - case Commands.ShowGitExplorer: - return Container.gitExplorer.show(); + case Commands.ShowRepositoriesExplorer: + return Container.repositoriesExplorer.show(); case Commands.ShowFileHistoryExplorer: return Container.fileHistoryExplorer.show(); case Commands.ShowLineHistoryExplorer: diff --git a/src/configuration.ts b/src/configuration.ts index 5a6e6f9..513a56c 100644 --- a/src/configuration.ts +++ b/src/configuration.ts @@ -14,9 +14,9 @@ import { CommandContext, extensionId, setCommandContext } from './constants'; import { Container } from './container'; import { clearGravatarCache } from './git/gitService'; import { Functions } from './system'; -import { IConfig, KeyMap } from './ui/config'; +import { Config, KeyMap } from './ui/config'; -const emptyConfig: any = new Proxy({} as IConfig, { +const emptyConfig: any = new Proxy({} as Config, { get(target, propKey, receiver) { return emptyConfig; } @@ -42,10 +42,10 @@ export class Configuration { `gitlens.${this.name('modes').value}`, `gitlens.${this.name('codeLens').value}`, `gitlens.${this.name('currentLine').value}`, - `gitlens.${this.name('gitExplorer').value}`, `gitlens.${this.name('fileHistoryExplorer').value}`, `gitlens.${this.name('hovers').value}`, `gitlens.${this.name('lineHistoryExplorer').value}`, + `gitlens.${this.name('repositoriesExplorer').value}`, `gitlens.${this.name('statusBar').value}` ]; } @@ -244,8 +244,8 @@ export class Configuration { } } - name(name: K) { - return Functions.propOf(emptyConfig as IConfig, name); + name(name: K) { + return Functions.propOf(emptyConfig as Config, name); } update(section: string, value: any, target: ConfigurationTarget, resource?: Uri | null) { diff --git a/src/constants.ts b/src/constants.ts index 89e38a6..2e29aad 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -32,13 +32,13 @@ export enum CommandContext { CanToggleCodeLens = 'gitlens:canToggleCodeLens', Enabled = 'gitlens:enabled', ExplorersCanCompare = 'gitlens:explorers:canCompare', - GitExplorer = 'gitlens:gitExplorer', - GitExplorerAutoRefresh = 'gitlens:gitExplorer:autoRefresh', HasRemotes = 'gitlens:hasRemotes', FileHistoryExplorer = 'gitlens:fileHistoryExplorer', LineHistoryExplorer = 'gitlens:lineHistoryExplorer', Key = 'gitlens:key', KeyMap = 'gitlens:keymap', + RepositoriesExplorer = 'gitlens:repositoriesExplorer', + RepositoriesExplorerAutoRefresh = 'gitlens:repositoriesExplorer:autoRefresh', ResultsExplorer = 'gitlens:resultsExplorer', ResultsExplorerKeepResults = 'gitlens:resultsExplorer:keepResults' } @@ -125,6 +125,6 @@ export const ImageMimetypes: { [key: string]: string } = { }; export enum WorkspaceState { - GitExplorerAutoRefresh = 'gitlens:gitExplorer:autoRefresh', + RepositoriesExplorerAutoRefresh = 'gitlens:repositoriesExplorer:autoRefresh', ResultsExplorerKeepResults = 'gitlens:resultsExplorer:keepResults' } diff --git a/src/container.ts b/src/container.ts index e7f2d01..40f6602 100644 --- a/src/container.ts +++ b/src/container.ts @@ -3,7 +3,7 @@ import { Disposable, ExtensionContext } from 'vscode'; import { FileAnnotationController } from './annotations/fileAnnotationController'; import { LineAnnotationController } from './annotations/lineAnnotationController'; import { CodeLensController } from './codelens/codeLensController'; -import { configuration, IConfig } from './configuration'; +import { Config, configuration } from './configuration'; import { GitFileSystemProvider } from './git/fsProvider'; import { GitService } from './git/gitService'; import { LineHoverController } from './hovers/lineHoverController'; @@ -13,14 +13,14 @@ import { GitDocumentTracker } from './trackers/gitDocumentTracker'; import { GitLineTracker } from './trackers/gitLineTracker'; import { ExplorerCommands } from './views/explorerCommands'; import { FileHistoryExplorer } from './views/fileHistoryExplorer'; -import { GitExplorer } from './views/gitExplorer'; import { LineHistoryExplorer } from './views/lineHistoryExplorer'; +import { RepositoriesExplorer } from './views/repositoriesExplorer'; import { ResultsExplorer } from './views/resultsExplorer'; import { SettingsEditor } from './webviews/settingsEditor'; import { WelcomeEditor } from './webviews/welcomeEditor'; export class Container { - static initialize(context: ExtensionContext, config: IConfig) { + static initialize(context: ExtensionContext, config: Config) { this._context = context; this._config = Container.applyMode(config); @@ -40,15 +40,15 @@ export class Container { context.subscriptions.push((this._settingsEditor = new SettingsEditor())); context.subscriptions.push((this._welcomeEditor = new WelcomeEditor())); - if (config.gitExplorer.enabled) { - context.subscriptions.push((this._gitExplorer = new GitExplorer())); + if (config.repositoriesExplorer.enabled) { + context.subscriptions.push((this._repositoriesExplorer = new RepositoriesExplorer())); } else { let disposable: Disposable; disposable = configuration.onDidChange(e => { - if (configuration.changed(e, configuration.name('gitExplorer')('enabled').value)) { + if (configuration.changed(e, configuration.name('repositoriesExplorer')('enabled').value)) { disposable.dispose(); - context.subscriptions.push((this._gitExplorer = new GitExplorer())); + context.subscriptions.push((this._repositoriesExplorer = new RepositoriesExplorer())); } }); } @@ -87,10 +87,10 @@ export class Container { return this._codeLensController; } - private static _config: IConfig | undefined; + private static _config: Config | undefined; static get config() { if (this._config === undefined) { - this._config = Container.applyMode(configuration.get()); + this._config = Container.applyMode(configuration.get()); } return this._config; } @@ -127,9 +127,9 @@ export class Container { return this._git; } - private static _gitExplorer: GitExplorer | undefined; - static get gitExplorer(): GitExplorer { - return this._gitExplorer!; + private static _repositoriesExplorer: RepositoriesExplorer | undefined; + static get repositoriesExplorer(): RepositoriesExplorer { + return this._repositoriesExplorer!; } private static _keyboard: Keyboard; @@ -194,7 +194,7 @@ export class Container { this._config = undefined; } - private static applyMode(config: IConfig) { + private static applyMode(config: Config) { if (!config.mode.active) return config; const mode = config.modes[config.mode.active]; @@ -207,7 +207,7 @@ export class Container { config.currentLine.enabled = mode.currentLine; } if (mode.explorers != null) { - config.gitExplorer.enabled = mode.explorers; + config.repositoriesExplorer.enabled = mode.explorers; } if (mode.explorers != null) { config.fileHistoryExplorer.enabled = mode.explorers; diff --git a/src/extension.ts b/src/extension.ts index 6d721e3..f1e41ca 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -2,7 +2,7 @@ import { commands, ExtensionContext, extensions, window, workspace } from 'vscode'; import { Commands, configureCommands } from './commands'; -import { configuration, Configuration, IConfig } from './configuration'; +import { Config, configuration, Configuration } from './configuration'; import { CommandContext, extensionQualifiedId, GlobalState, GlyphChars, setCommandContext } from './constants'; import { Container } from './container'; import { GitService } from './git/gitService'; @@ -31,12 +31,15 @@ export async function activate(context: ExtensionContext) { Configuration.configure(context); - const cfg = configuration.get(); + const cfg = configuration.get(); // Pretend we are enabled (until we know otherwise) and set the explorer contexts to reduce flashing on load await Promise.all([ setCommandContext(CommandContext.Enabled, true), - setCommandContext(CommandContext.GitExplorer, cfg.gitExplorer.enabled ? cfg.gitExplorer.location : false), + setCommandContext( + CommandContext.RepositoriesExplorer, + cfg.repositoriesExplorer.enabled ? cfg.repositoriesExplorer.location : false + ), setCommandContext( CommandContext.FileHistoryExplorer, cfg.fileHistoryExplorer.enabled ? cfg.fileHistoryExplorer.location : false @@ -101,6 +104,43 @@ async function migrateSettings(context: ExtensionContext, previousVersion: strin try { if (Versions.compare(previous, Versions.from(9, 0, 0)) !== 1) { await configuration.migrate( + 'gitExplorer.autoRefresh', + configuration.name('repositoriesExplorer')('autoRefresh').value + ); + await configuration.migrate( + 'gitExplorer.branches.layout', + configuration.name('repositoriesExplorer')('branches')('layout').value + ); + await configuration.migrate( + 'gitExplorer.enabled', + configuration.name('repositoriesExplorer')('enabled').value + ); + await configuration.migrate( + 'gitExplorer.files.compact', + configuration.name('repositoriesExplorer')('files')('compact').value + ); + await configuration.migrate( + 'gitExplorer.files.layout', + configuration.name('repositoriesExplorer')('files')('layout').value + ); + await configuration.migrate( + 'gitExplorer.files.threshold', + configuration.name('repositoriesExplorer')('files')('threshold').value + ); + await configuration.migrate( + 'gitExplorer.includeWorkingTree', + configuration.name('repositoriesExplorer')('includeWorkingTree').value + ); + await configuration.migrate( + 'gitExplorer.location', + configuration.name('repositoriesExplorer')('location').value + ); + await configuration.migrate( + 'gitExplorer.showTrackingBranch', + configuration.name('repositoriesExplorer')('showTrackingBranch').value + ); + + await configuration.migrate( 'historyExplorer.avatars', configuration.name('fileHistoryExplorer')('avatars').value ); diff --git a/src/git/gitService.ts b/src/git/gitService.ts index adea137..01958b4 100644 --- a/src/git/gitService.ts +++ b/src/git/gitService.ts @@ -17,7 +17,7 @@ import { WorkspaceFoldersChangeEvent } from 'vscode'; import { GitExtension } from '../@types/git'; -import { configuration, IRemotesConfig } from '../configuration'; +import { configuration, RemotesConfig } from '../configuration'; import { CommandContext, DocumentSchemes, GlyphChars, setCommandContext } from '../constants'; import { Container } from '../container'; import { Logger } from '../logger'; @@ -1466,7 +1466,7 @@ export class GitService implements Disposable { providerMap = providerMap || RemoteProviderFactory.createMap( - configuration.get(configuration.name('remotes').value, null) + configuration.get(configuration.name('remotes').value, null) ); try { diff --git a/src/git/models/repository.ts b/src/git/models/repository.ts index dc5363b..c35f9c3 100644 --- a/src/git/models/repository.ts +++ b/src/git/models/repository.ts @@ -10,7 +10,7 @@ import { workspace, WorkspaceFolder } from 'vscode'; -import { configuration, IRemotesConfig } from '../../configuration'; +import { configuration, RemotesConfig } from '../../configuration'; import { Container } from '../../container'; import { Functions } from '../../system'; import { GitBranch, GitDiffShortStat, GitRemote, GitStash, GitStatus, GitTag } from '../git'; @@ -155,7 +155,7 @@ export class Repository implements Disposable { const section = configuration.name('remotes').value; if (initializing || configuration.changed(e, section, this.folder.uri)) { this._providerMap = RemoteProviderFactory.createMap( - configuration.get(section, this.folder.uri) + configuration.get(section, this.folder.uri) ); if (!initializing) { @@ -244,7 +244,7 @@ export class Repository implements Disposable { getRemotes(): Promise { if (this._remotes === undefined) { if (this._providerMap === undefined) { - const remotesCfg = configuration.get( + const remotesCfg = configuration.get( configuration.name('remotes').value, this.folder.uri ); diff --git a/src/git/remotes/custom.ts b/src/git/remotes/custom.ts index 4478528..02781ba 100644 --- a/src/git/remotes/custom.ts +++ b/src/git/remotes/custom.ts @@ -1,13 +1,13 @@ 'use strict'; import { Range } from 'vscode'; -import { IRemotesUrlsConfig } from '../../configuration'; +import { RemotesUrlsConfig } from '../../configuration'; import { Strings } from '../../system'; import { RemoteProvider } from './provider'; export class CustomService extends RemoteProvider { - private readonly urls: IRemotesUrlsConfig; + private readonly urls: RemotesUrlsConfig; - constructor(domain: string, path: string, urls: IRemotesUrlsConfig, protocol?: string, name?: string) { + constructor(domain: string, path: string, urls: RemotesUrlsConfig, protocol?: string, name?: string) { super(domain, path, protocol, name, true); this.urls = urls; } diff --git a/src/git/remotes/factory.ts b/src/git/remotes/factory.ts index 6f0e7ca..d830f50 100644 --- a/src/git/remotes/factory.ts +++ b/src/git/remotes/factory.ts @@ -1,5 +1,5 @@ 'use strict'; -import { CustomRemoteType, IRemotesConfig } from '../../configuration'; +import { CustomRemoteType, RemotesConfig } from '../../configuration'; import { Logger } from '../../logger'; import { BitbucketService } from './bitbucket'; import { BitbucketServerService } from './bitbucket-server'; @@ -43,7 +43,7 @@ export class RemoteProviderFactory { } } - static createMap(cfg: IRemotesConfig[] | null | undefined): RemoteProviderMap { + static createMap(cfg: RemotesConfig[] | null | undefined): RemoteProviderMap { const providerMap = new Map(defaultProviderMap); if (cfg != null && cfg.length > 0) { for (const rc of cfg) { @@ -56,7 +56,7 @@ export class RemoteProviderFactory { return providerMap; } - private static getCustomProvider(cfg: IRemotesConfig) { + private static getCustomProvider(cfg: RemotesConfig) { switch (cfg.type) { case CustomRemoteType.Bitbucket: return (domain: string, path: string) => diff --git a/src/ui/config.ts b/src/ui/config.ts index dae6268..135545d 100644 --- a/src/ui/config.ts +++ b/src/ui/config.ts @@ -95,20 +95,17 @@ export enum StatusBarCommand { ToggleFileBlame = 'gitlens.toggleFileBlame' } -export interface IAdvancedConfig { +export interface AdvancedConfig { blame: { customArguments: string[] | null; delayAfterEdit: number; sizeThresholdAfterEdit: number; }; - caching: { enabled: boolean; }; - fileHistoryFollowsRenames: boolean; maxListItems: number; - messages: { suppressCommitHasNoPreviousCommitWarning: boolean; suppressCommitNotFoundWarning: boolean; @@ -119,84 +116,61 @@ export interface IAdvancedConfig { suppressNoRepositoryWarning: boolean; suppressShowKeyBindingsNotice: boolean; }; - quickPick: { closeOnFocusOut: boolean; }; - repositorySearchDepth: number; - telemetry: { enabled: boolean; }; } -export interface ICodeLensConfig { +export interface CodeLensConfig { authors: { enabled: boolean; command: CodeLensCommand; }; - enabled: boolean; - recentChange: { enabled: boolean; command: CodeLensCommand; }; - scopes: CodeLensScopes[]; scopesByLanguage: CodeLensLanguageScope[]; symbolScopes: string[]; } -export interface IExplorersConfig { +export interface ExplorersConfig { avatars: boolean; - files: { layout: ExplorerFilesLayout; compact: boolean; threshold: number; }; - commitFileFormat: string; commitFormat: string; // dateFormat: string | null; defaultItemLimit: number; - stashFileFormat: string; stashFormat: string; statusFileFormat: string; } -export interface IExplorersFilesConfig { +export interface ExplorersFilesConfig { compact: boolean; layout: ExplorerFilesLayout; threshold: number; } -export interface IGitExplorerConfig { - autoRefresh: boolean; - - branches: { - layout: ExplorerBranchesLayout; - }; - - enabled: boolean; - files: IExplorersFilesConfig; - includeWorkingTree: boolean; - location: 'explorer' | 'gitlens' | 'scm'; - showTrackingBranch: boolean; -} - -export interface IFileHistoryExplorerConfig { +export interface FileHistoryExplorerConfig { avatars: boolean; enabled: boolean; location: 'explorer' | 'gitlens' | 'scm'; } -export interface ILineHistoryExplorerConfig extends IFileHistoryExplorerConfig {} +export interface LineHistoryExplorerConfig extends FileHistoryExplorerConfig {} -export interface IMenuConfig { +export interface MenuConfig { editor: | false | { @@ -229,7 +203,7 @@ export interface IMenuConfig { }; } -export interface IModeConfig { +export interface ModeConfig { name: string; statusBarItemName?: string; description?: string; @@ -240,20 +214,32 @@ export interface IModeConfig { statusBar?: boolean; } -export interface IResultsExplorerConfig { - files: IExplorersFilesConfig; +export interface RepositoriesExplorerConfig { + autoRefresh: boolean; + branches: { + layout: ExplorerBranchesLayout; + }; + enabled: boolean; + files: ExplorersFilesConfig; + includeWorkingTree: boolean; + location: 'explorer' | 'gitlens' | 'scm'; + showTrackingBranch: boolean; +} + +export interface ResultsExplorerConfig { + files: ExplorersFilesConfig; location: 'explorer' | 'gitlens' | 'scm'; } -export interface IRemotesConfig { +export interface RemotesConfig { domain: string; name?: string; protocol?: string; type: CustomRemoteType; - urls?: IRemotesUrlsConfig; + urls?: RemotesUrlsConfig; } -export interface IRemotesUrlsConfig { +export interface RemotesUrlsConfig { repository: string; branches: string; branch: string; @@ -265,7 +251,7 @@ export interface IRemotesUrlsConfig { fileRange: string; } -export interface IConfig { +export interface Config { blame: { avatars: boolean; compact: boolean; @@ -283,34 +269,25 @@ export interface IConfig { separateLines: boolean; toggleMode: AnnotationsToggleMode; }; - currentLine: { scrollable: boolean; dateFormat: string | null; enabled: boolean; format: string; }; - - codeLens: ICodeLensConfig; - + codeLens: CodeLensConfig; debug: boolean; defaultDateFormat: string | null; defaultDateStyle: DateStyle; defaultGravatarsStyle: GravatarDefaultStyle; - - explorers: IExplorersConfig; - - gitExplorer: IGitExplorerConfig; - + explorers: ExplorersConfig; heatmap: { ageThreshold: number; coldColor: string; hotColor: string; toggleMode: AnnotationsToggleMode; }; - - fileHistoryExplorer: IFileHistoryExplorerConfig; - + fileHistoryExplorer: FileHistoryExplorerConfig; hovers: { annotations: { changes: boolean; @@ -318,22 +295,19 @@ export interface IConfig { enabled: boolean; over: 'line' | 'annotation'; }; - currentLine: { changes: boolean; details: boolean; enabled: boolean; over: 'line' | 'annotation'; }; - avatars: boolean; enabled: boolean; }; - insiders: boolean; keymap: KeyMap; - lineHistoryExplorer: ILineHistoryExplorerConfig; - menus: boolean | IMenuConfig; + lineHistoryExplorer: LineHistoryExplorerConfig; + menus: boolean | MenuConfig; mode: { active: string; statusBar: { @@ -341,22 +315,18 @@ export interface IConfig { alignment: 'left' | 'right'; }; }; - modes: { [key: string]: IModeConfig }; + modes: { [key: string]: ModeConfig }; outputLevel: OutputLevel; - recentChanges: { highlight: { locations: HighlightLocations[]; }; toggleMode: AnnotationsToggleMode; }; - - remotes: IRemotesConfig[]; - - resultsExplorer: IResultsExplorerConfig; - + remotes: RemotesConfig[]; + repositoriesExplorer: RepositoriesExplorerConfig; + resultsExplorer: ResultsExplorerConfig; showWhatsNewAfterUpgrades: boolean; - statusBar: { alignment: 'left' | 'right'; command: StatusBarCommand; @@ -365,7 +335,6 @@ export interface IConfig { format: string; reduceFlicker: boolean; }; - strings: { codeLens: { unsavedChanges: { @@ -375,6 +344,5 @@ export interface IConfig { }; }; }; - - advanced: IAdvancedConfig; + advanced: AdvancedConfig; } diff --git a/src/ui/images/settings/gitlens-file-history-explorer-avatars.png b/src/ui/images/settings/file-history-explorer-avatars.png similarity index 100% rename from src/ui/images/settings/gitlens-file-history-explorer-avatars.png rename to src/ui/images/settings/file-history-explorer-avatars.png diff --git a/src/ui/images/settings/gitlens-file-history-explorer.png b/src/ui/images/settings/file-history-explorer.png similarity index 100% rename from src/ui/images/settings/gitlens-file-history-explorer.png rename to src/ui/images/settings/file-history-explorer.png diff --git a/src/ui/images/settings/gitlens-explorer-avatars.png b/src/ui/images/settings/repositories-explorer-avatars.png similarity index 100% rename from src/ui/images/settings/gitlens-explorer-avatars.png rename to src/ui/images/settings/repositories-explorer-avatars.png diff --git a/src/ui/images/settings/gitlens-explorer-tree-compact.png b/src/ui/images/settings/repositories-explorer-tree-compact.png similarity index 100% rename from src/ui/images/settings/gitlens-explorer-tree-compact.png rename to src/ui/images/settings/repositories-explorer-tree-compact.png diff --git a/src/ui/images/settings/gitlens-explorer-tree.png b/src/ui/images/settings/repositories-explorer-tree.png similarity index 100% rename from src/ui/images/settings/gitlens-explorer-tree.png rename to src/ui/images/settings/repositories-explorer-tree.png diff --git a/src/ui/images/settings/gitlens-explorer.png b/src/ui/images/settings/repositories-explorer.png similarity index 100% rename from src/ui/images/settings/gitlens-explorer.png rename to src/ui/images/settings/repositories-explorer.png diff --git a/src/ui/images/settings/gitlens-results-avatars.png b/src/ui/images/settings/results-explorer-avatars.png similarity index 100% rename from src/ui/images/settings/gitlens-results-avatars.png rename to src/ui/images/settings/results-explorer-avatars.png diff --git a/src/ui/images/settings/gitlens-results-tree-compact.png b/src/ui/images/settings/results-explorer-tree-compact.png similarity index 100% rename from src/ui/images/settings/gitlens-results-tree-compact.png rename to src/ui/images/settings/results-explorer-tree-compact.png diff --git a/src/ui/images/settings/gitlens-results-tree.png b/src/ui/images/settings/results-explorer-tree.png similarity index 100% rename from src/ui/images/settings/gitlens-results-tree.png rename to src/ui/images/settings/results-explorer-tree.png diff --git a/src/ui/images/settings/gitlens-results.png b/src/ui/images/settings/results-explorer.png similarity index 100% rename from src/ui/images/settings/gitlens-results.png rename to src/ui/images/settings/results-explorer.png diff --git a/src/ui/ipc.ts b/src/ui/ipc.ts index 25d1d92..03902fc 100644 --- a/src/ui/ipc.ts +++ b/src/ui/ipc.ts @@ -1,8 +1,8 @@ 'use strict'; -import { IConfig } from './config'; +import { Config } from './config'; export interface Bootstrap { - config: IConfig; + config: Config; } export interface SettingsBootstrap extends Bootstrap { @@ -24,7 +24,7 @@ export interface SaveSettingsMessage { export interface SettingsChangedMessage { type: 'settingsChanged'; - config: IConfig; + config: Config; } export type Message = SaveSettingsMessage | SettingsChangedMessage; diff --git a/src/ui/settings/index.html b/src/ui/settings/index.html index 812627b..7b2b209 100644 --- a/src/ui/settings/index.html +++ b/src/ui/settings/index.html @@ -20,8 +20,7 @@

- GitLens - supercharges the Git capabilities built into Visual Studio Code. It helps you to + GitLens supercharges the Git capabilities built into Visual Studio Code. It helps you to visualize code authorship at a glance via Git blame annotations and code lens, seamlessly navigate and explore Git repositories, gain valuable insights via powerful comparison commands, and so much more. @@ -50,10 +49,13 @@

For advanced customizations refer to the - GitLens - settings docs and edit your - User - Settings + + GitLens settings docs + + and edit your + + User Settings +

@@ -113,17 +115,18 @@

- Search for - - gitlens - in the - Keyboard - Shortcuts editor to see the shortcuts and to customize them further + Search for gitlens in the + + Keyboard Shortcuts + + editor to see the shortcuts and to customize them further

@@ -280,35 +283,36 @@

For more advanced customizations open - User - Settings and search for - - gitlens - + + User Settings + + and search for gitlens

-
+
-

GitLens Explorer - +

Repositories Explorer +

-

Adds a GitLens explorer to navigate and explore repositories - or file histories

+

+ Adds a Repositories explorer to visualize, navigate, and explore Git repositories +

- - + +
-
- - @@ -316,94 +320,95 @@
- - - + - - + - -
- - - - + + + +

For more advanced customizations open - User - Settings and search for - - gitlens.gitExplorer - or - - gitlens.explorers - + + User Settings + + and search for gitlens.repositoriesExplorer or gitlens.explorers

-
+
-

GitLens File History Explorer - +

File History Explorer +

-

Adds a GitLens File History explorer to visualize the - revision history of the current file

+

+ Adds a File History explorer to visualize, navigate, and explore the revision history + of the current file +

- +
@@ -424,30 +429,32 @@
- -
-
+
-

GitLens Line History Explorer - +

Line History Explorer +

-

Adds a GitLens Line History explorer to visualize the - revision history of the selected lines of current file

+

+ Adds a Line History explorer to visualize, navigate, and explore the revision history + of the selected lines of current file +

- +
@@ -468,24 +475,25 @@
- -
-
+
-

GitLens Results Explorer - +

Results Explorer +

-

Adds an on-demand GitLens Results explorer to navigate and - explore commits, histories, and searches, - or visualize comparisons between branches, tags, commits, and more

+

+ Adds an on-demand Results explorer to navigate and explore commits, histories, and + searches, or visualize comparisons between branches, tags, commits, and more +

@@ -512,8 +520,9 @@ type="checkbox" />
- +
- - - -

For more advanced customizations open - User - Settings and search for - - gitlens.resultsExplorer - or - - gitlens.explorers - + + User Settings + + and search for gitlens.resultsExplorer or gitlens.explorers

@@ -553,8 +558,9 @@ -

Adds authorship code lens to the top of files and on code - blocks

+

+ Adds authorship code lens to the top of files and on code blocks +

@@ -566,8 +572,9 @@
- +
@@ -656,16 +670,16 @@

For more advanced customizations open - User - Settings and search for - - gitlens.codeLens - + + User Settings + + and search for gitlens.codeLens Use the - GitLens: - Toggle Git Code Lens command to override this setting for the current - window + + GitLens: Toggle Git Code Lens + + command to override this setting for the current window

@@ -678,16 +692,18 @@ -

Adds an unobtrusive blame annotation at the end of the - current line

+

+ Adds an unobtrusive blame annotation at the end of the current line +

- +
@@ -781,11 +798,14 @@ data-visibility="settings.mode =advanced"> - +
- +
@@ -799,17 +819,16 @@

For more advanced customizations open - User - Settings and search for - - gitlens.currentLine - + + User Settings + + and search for gitlens.currentLine Use the - GitLens: - Toggle Line Blame Annotations command to override this setting for the - current - window + + GitLens: Toggle Line Blame Annotations + + command to override this setting for the current window

@@ -915,19 +934,23 @@ Learn more about advanced - formatting options + title="Open advanced formatting docs">Learn more + about advanced formatting options +
- +
-

Indicator color reflects the age of the most recent change - (hot or cold), while indicator - brightness ranges from bright (newer) to dim (older) based on the relative age

+

+ Indicator color reflects the age of the most recent change (hot or cold), while + indicator brightness ranges from bright (newer) to dim (older) based on the + relative age +

- +
- +
@@ -1031,12 +1056,11 @@ -

Adds on-demand heatmap (age) indicator to the edge of the - gutter to show how recently lines were - changed -
Indicator color reflects the age of the most recent change (hot or cold), while - indicator - brightness ranges from bright (newer) to dim (older) based on the relative age +

+ Adds on-demand heatmap (age) indicator to the edge of the gutter to show how recently + lines were changed
Indicator color reflects the age of the most recent change + (hot or cold), while indicator brightness ranges from bright (newer) to dim (older) + based on the relative age

@@ -1059,15 +1083,16 @@

Use the - + + data-visibility="heatmap.toggleMode =window"> + GitLens: Toggle File Heatmap Annotations + command to turn the annotations on or off - Press - Esc to turn off the annotations + Press Esc to turn off the annotations

@@ -1251,8 +1276,9 @@ -

GitLens supports user-defined modes for quickly toggling - between sets of settings

+

+ GitLens supports user-defined modes for quickly toggling between sets of settings +

@@ -1284,25 +1310,30 @@

For more advanced customizations or to add your own modes, open - User - Settings and search for - - gitlens.modes - + + User Settings + + and search for gitlens.modes Use the - GitLens: - Switch Mode command to quickly switch the active mode + + GitLens: Switch Mode + + command to quickly switch the active mode Use the - GitLens: - Toggle Review Mode command to toggle Review mode + + GitLens: Toggle Review Mode + + command to toggle Review mode Use the - GitLens: - Toggle Zen Mode command to toggle Zen mode + + GitLens: Toggle Zen Mode + + command to toggle Zen mode

@@ -1315,8 +1346,10 @@ -

Adds on-demand recent changes annotations to highlight lines - changed by the most recent commit

+

+ Adds on-demand recent changes annotations to highlight lines changed by the most recent + commit +

@@ -1361,15 +1394,16 @@

Use the - + + data-visibility="recentChanges.toggleMode =window"> + GitLens: Toggle Recent File Changes Annotations + command to turn the annotations on or off - Press - Esc to turn off the annotations + Press Esc to turn off the annotations

@@ -1382,16 +1416,18 @@ -

Adds a Git blame annotation about the current line to the - status bar

+

+ Adds a Git blame annotation about the current line to the status bar +

- +
@@ -1494,14 +1531,17 @@ @@ -1513,9 +1553,10 @@ type="checkbox" disabled />
- +
@@ -1529,17 +1570,16 @@

For more advanced customizations open - User - Settings and search for - - gitlens.statusBar - + + User Settings + + and search for gitlens.statusBar Use the - GitLens: - Toggle Line Blame Annotations command to override this setting for the - current - window + + GitLens: Toggle Line Blame Annotations + + command to override this setting for the current window

@@ -1554,30 +1594,40 @@ General
  • - GitLens - Explorer + + Repositories Explorer +
  • - GitLens - File History Explorer + + File History Explorer +
  • - GitLens - Results Explorer + + Line History Explorer + +
    • +
  • + + Results Explorer +
  • Code Lens
  • - Current - Line Blame + + Current Line Blame +
  • Gutter Blame
  • - Gutter - Heatmap + + Gutter Heatmap +
  • Hovers @@ -1586,12 +1636,14 @@ Modes
  • - Recent - Changes + + Recent Changes +
  • - Status - Bar Blame + + Status Bar Blame +
    • @@ -1607,12 +1659,14 @@
    • - Write - a Review + + Write a Review +
    • - Star - or Fork me on GitHub + + Star or Fork me on GitHub +
    • Follow me on Twitter diff --git a/src/ui/welcome/index.html b/src/ui/welcome/index.html index 5092f11..282babf 100644 --- a/src/ui/welcome/index.html +++ b/src/ui/welcome/index.html @@ -19,8 +19,7 @@

      - GitLens - supercharges the Git capabilities built into Visual Studio Code. It helps you to + GitLens supercharges the Git capabilities built into Visual Studio Code. It helps you to visualize code authorship at a glance via Git blame annotations and code lens, seamlessly navigate and explore Git repositories, gain valuable insights via powerful comparison commands, and so much more. @@ -29,1050 +28,40 @@

      - Configure - GitLens + + Configure GitLens

      Don't miss how easy it is to configure GitLens!

      - Support GitLens - ❤ + + Support GitLens ❤

      What's New in - GitLens 8 🎉🎈

      + GitLens 9 🎉🎈
      • - 8.5 - JULY  2018 + 9.0 + SEPT  2018
      • NEW - Adds an all-new - GitLens sidebar view to contain the - GitLens, - GitLens File History, and - GitLens Results explorers
        -

        The new view is enabled by default, but can easily be configured back to the existing - locations via the - GitLens interactive settings editor -

        • -
      • - NEW - Adds emoji support, e.g. :smile: in commit messages will now be 😃 — closes - #429 -
        -
        • -
      • - NEW - Adds - Compare with Selected and - Select for Compare commands to file nodes in the - GitLens, - GitLens File History, and - GitLens Results explorers — closes - #446 -
        -
        • -
      • - NEW - Adds tag annotations to the tag tooltips in the - GitLens explorer — closes - #431 -
        -
        • -
      • - NEW - Adds - Choose from Branch or Tag History... command to the quick pick menu shown by the - Show File History... command ( - gitlens.showQuickFileHistory) — closes - #316 -
        -
        • -
      • - NEW - Adds the - Compare File with Revision... - command ( - gitlens.diffWithRevision) as an alternate ( - alt+click) for the - Compare File with Previous Revision command in the editor toolbar -
        -
        • -
      • - NEW - Adds - Checkout Commit (via Terminal) command ( - gitlens.terminalCheckoutCommit) to commit node(s) of the GitLens explorer - — closes - #463 -
        -
        • -
      • - NEW - Adds a - gitlens.hovers.avatars setting to specify whether to show avatar images in hovers - — closes - #432 - thanks to - PR #441 - by - Segev Finer -
        -
        • -
      • - NEW - Adds - gitlens.historyExplorer.avatars setting to specify whether to show avatar images - instead of status icons in the - GitLens File History explorer — allows for an independent value from the other explorers -
        -
        • -
      • - NEW - Adds the - gitlens.hovers.avatars setting to the - GitLens interactive settings editor to specify whether to show avatar images in hovers -
        -
        • -
      • - NEW - Adds Copy Remote File Url to Clipboard (gitlens.copyRemoteFileUrlToClipboard) - command — copies the remote url of the current file and line to the clipboard — closes - #467 -
        -
        • -
      • - IMPROVED - Improves performance of providing blame annotations, especially for large files (a ~33% improvement on some files) -
        -
        • -
      • - IMPROVED - Changes commit search by sha to jump directly to the commit (if one is found), rather than having to click through to the - commit -
        -
        • -
      • - IMPROVED - Renames the - GitLens History explorer to - GitLens File History explorer for better clarity -
        -
        • -
      • - IMPROVED - Changes the - GitLens File History explorer to always show the full file history even when reviewing - revisions -
        -
        • -
      • - IMPROVED - Changes the behavior of and renames the - Show Branches and Tags command and on the quick pick menu shown by the - Compare File with Revision... command ( - gitlens.diffWithRevision) to - Choose from Branch or Tag History... -
        -
        • -
      • - IMPROVED - Changes Rebase to Commit (via Terminal) command (gitlens.terminalRebaseCommit) - to apply to all commit node(s) of the GitLens explorer -
        -
        • -
      • - IMPROVED - Changes Reset to Commit (via Terminal) command (gitlens.terminalResetCommit) - to apply to all commit node(s) of the GitLens explorer -
        -
        • -
      • - IMPROVED - Removes - gitlens:activeIsTracked, - gitlens:activeIsBlameable, - gitlens:activeIsRevision, and - gitlens:activeHasRemotes contexts and consolidates them into - gitlens:activeFileStatus for better performance and UX -
        -
        • -
      • - FIXED - Fixes - #436 - — Copy to clipboard not working -
        -
        • -
      • - FIXED - Fixes - #442 - — GitLens File History fails if name (or path) starts with - - -
        -
        • -
      • - FIXED - Fixes - #440 - — Searching for commits with an empty query yields to no results anymore -
        -
        • -
      • - FIXED - Fixes - #444 - — GitLens custom viewlet icon slightly larger than standard -
        -
        • -
      • - FIXED - Fixes - #437 - — Remove - --first-parent from git commands to show file history from merged in -
        -
        • -
      • - FIXED - Fixes - #252 - — Cannot read property 'push' of undefined -
        -
        • -
      • - FIXED - Fixes - #451 - — "apply Changes" has discarded all my changes -
        -
        • -
      • - FIXED - Fixes - #449 - — Stop hiding explorers by default when in Zen mode -
        -
        • -
      • - FIXED - Fixes - #454 - — Search for string returns merge commits (unlike raw `git log -S`) -
        -
        • - -
      • - FIXED - Fixes - #462 - — Source Control shortcut on macOS (⌃⇧G) shouldn't be overridden -
        -
        • -
      • - FIXED - Fixes - #457 - — Displays the wrong username (You) — thanks to - PR #460 - by - Zyck -
        -
        • -
      • - FIXED - Fixes - #459 - — File blame annotation text overflow with letter spacing setting -
        -
        • -
      • - FIXED - Fixes - #471 - — Don't use Ctrl+Alt+[character] as a shortcut -
        -
        • -
      • - FIXED - Fixes - #478 - — suppressShowKeyBindingsNotice gets saved even when it is not required -
        -
        • -
      • - FIXED - Fixes - #468 - — Commit history for detached HEAD doesn't work properly -
        -
        • -
      • - FIXED - Fixes - #477 - — Can't load any GitLens features or UI -
        -
        • -
      • - FIXED - Fixes - #482 - — UI displays "undefined" in results panel when comparing -
        -
        • -
      • - FIXED - Fixes issues with GitLens Welcome and the interactive settings editor with light themes -
        -
        • -
      • - FIXED - Fixes issue where commands in the editor toolbar would flash unnecessarily when navigating history or switching tabs -
        -
        • -
      • - FIXED - Fixes issue where the - Compare File with Previous Revision command wouldn't work properly when the file had - been renamed in some cases -
        -
        • -
      • - FIXED - Fixes issue where the - Compare File with Next Revision command wouldn't work properly when the file had been - renamed in some cases -
        -
        • -
      • - FIXED - Fixes issue where changed files count was wrong when the branch was behind the upstream -
        -
        • -
      • - FIXED - Fixes issue where the - GitLens File History explorer wasn't being updated automatically for working changes -
        -
        • -
      • - FIXED - Fixes issue where the - Compare File with * Revision commands in the editor toolbar would show and hide too often - because of insignificant focus changes -
        -
        • -
      • - FIXED - Fixes issue where the scope box would be empty when there was no workspace open in the interactive settings editor -
        -
        • -
      • - FIXED - Fixes issue where GitLens saves a couple settings with default values into user settings (rather than just removing the setting) -
        -
        • -
      • - FIXED - Fixes issue showing changes with untracked stashed files -
        -
        • -
      • - FIXED - Fixes issue showing changes with working file when the file has been renamed -
        -
        • - -
      • - 8.4 - JUNE  2018 -
        -
        • -
      • - NEW - Adds completely revamped heatmap annotations -
        -

        The indicator's color, now customizable, will either be hot or cold based on the age of - the most recent change (cold after 90 days by default) — closes - #419 -

        - Cold Heatmap -

        The indicator's brightness ranges from bright (newer) to dim (older) based on the relative - age, which is calculated from the median age of all the changes in the file -

        -
        -
        • -
      • - NEW - Adds new branch history node under the - Repository Status node in the - GitLens explorer -
        -
        • -
      • - NEW - Adds GitLab and Visual Studio Team Services icons to the remote nodes in the - GitLens explorer — thanks to - PR #421 - by - Maxim Pekurin -
        -
        • -
      • - NEW - Adds - gitlens.heatmap.ageThreshold setting to specify the age of the most recent change - (in days) after which the gutter heatmap annotations will be cold rather than hot (i.e. will - use - gitlens.heatmap.coldColor instead of - gitlens.heatmap.hotColor) -
        -
        • -
      • - NEW - Adds - gitlens.heatmap.coldColor setting to specify the base color of the gutter heatmap - annotations when the most recent change is older (cold) than the - gitlens.heatmap.ageThreshold setting -
        -
        • -
      • - NEW - Adds - gitlens.heatmap.hotColor setting to specify the base color of the gutter heatmap - annotations when the most recent change is newer (hot) than the - gitlens.heatmap.ageThreshold setting -
        -
        • -
      • - FIXED - Fixes - #400 - — GitLens logging to debug console when debugging different extension -
        -
        • -
      • - FIXED - Fixes - #409 - — Literal $(ellipsis) inserted into commit QuickPick menu entry placeholder text -
        -
        • -
      • - FIXED - Fixes - #415 - — Branch names get mangled by color escapes — thanks to - PR #416 - by - Roy Ivy III -
        -
        • -
      • - FIXED - Fixes issue with insiders builds because of the new - SymbolInformation API changes (see - Microsoft/vscode#34968) -
        -
        • - -
      • - 8.3 - MAY  2018 -
        -
        • -
      • - NEW - Adds the ability to control where the - GitLens, - GitLens File History, and - GitLens Results explorers are shown 🎉 — closes - #213, - #377 -
        -
        • -
      • - NEW - Adds user-defined modes for quickly toggling between sets of settings -
        - Mode Switch -
        -
        • -
      • - NEW - Adds - Switch Mode command ( - gitlens.switchMode) to quickly switch the active GitLens mode -
        -
        • -
      • - NEW - Adds - Toggle Zen Mode command ( - gitlens.toggleZenMode) to toggle Zen mode which disables many visual features -
        -
        • -
      • - NEW - Adds - Toggle Review Mode command ( - gitlens.toggleReviewMode) to toggle Review mode which enables many visual features -
        -
        • -
      • - NEW - Adds modes settings ( - gitlens.mode.*) to the interactive settings editor -
        - Mode Settings -
        -
        • -
      • - NEW - Adds an icon for the - Compare File with Previous Revision command ( - gitlens.diffWithPrevious) and moves it into the editor toolbar -
        -
        • -
      • - NEW - Adds an icon for the - Compare File with Next Revision command ( - gitlens.diffWithNext) and moves it into the editor toolbar -
        -
        • -
      • - NEW - Adds menu settings ( - gitlens.menus.*) to the interactive settings editor -
        - Menu Settings -
        -
        • -
      • - NEW - Adds a display mode dropdown at the top of the interactive settings editor to reduce complexity -
        - Settings Mode -
        -
        • -
      • - NEW - Adds (re-adds) support for handling single files — closes - #321 -
        -
        • -
      • - NEW - Adds a tree layout option to tags in the - GitLens explorer — closes - #358 -
        -
        • -
      • - NEW - Adds - Show GitLens Explorer command ( - gitlens.showGitExplorer) — shows/expands the - GitLens explorer -
        -
        • -
      • - NEW - Adds - Show File History Explorer command ( - gitlens.showHistoryExplorer) — shows/expands the - GitLens File History explorer -
        -
        • -
      • - NEW - Adds - Show Results Explorer command ( - gitlens.showResultsExplorer) — shows/expands the - GitLens Results explorer -
        -
        • -
      • - NEW - Adds - Close Repository command ( - gitlens.explorers.closeRepository) to repository and repository status nodes in - the - GitLens explorer — closes (hides) the repository in the - GitLens explorer -
        -
        • -
      • - NEW - Adds clipboard support for Linux without requiring any external dependencies — thanks to - PR #394 - by - Cédric Malard -
        -
        • -
      • - NEW - Adds a select branch quick pick menu to the - Open File in Remote command ( - gitlens.openFileInRemote) when the current branch has no upstream tracking branch - — closes - #209 -
        -
        • -
      • - IMPROVED - Showing results in the - GitLens Results explorer now properly shows the explorer first -
        -
        • -
      • - IMPROVED - Renames - Compare Line Revision with Previous command to - Compare Commit with Previous for better consistency with other commands -
        -
        • -
      • - IMPROVED - Renames - Compare Line Revision with Working File command to - Compare Commit with Working File for better consistency with other commands -
        -
        • -
      • - IMPROVED - Renames - Show Commit File Details command to - Show Commit Details for better consistency with other commands -
        -
        • -
      • - IMPROVED - Reworks GitLens menu contributions and configuration — see menu settings above -
        -
        • -
      • - IMPROVED - Renames the - gitlens.advanced.menus setting to - gitlens.menus -
        -
        • -
      • - IMPROVED - Uses the new Webview API for better interactions and behavior with the interactive settings editor and welcome page -
        -
        • -
      • - IMPROVED - Moves the - Open Working File command ( - gitlens.openWorkingFile) to the right of the - Compare File with * Revision commands in the editor toolbar -
        -
        • -
      • - FIXED - Fixes - #366 - — Running a GitLens command from a keybinding fails -
        -
        • -
      • - FIXED - Fixes - #155 - — Navigating file diffs with - alt+, gets stuck -
        -
        • -
      • - FIXED - Fixes - #359 - — Show changes of an added file in the first commit -
        -
        • -
      • - FIXED - Fixes - #372 - — Wrong URL to VSTS work item when using hash work item id in commit -
        -
        • -
      • - FIXED - Fixes - #362 - — Too many code lenses in postcss files -
        -
        • -
      • - FIXED - Fixes - #381 - — Can't stash single files with older versions of Git -
        -
        • -
      • - FIXED - Fixes - #384 - — Absolute dates not always honored in - GitLens Results explorer -
        -
        • -
      • - FIXED - Fixes - #385 - — Wrong git command to delete remote branch -
        -
        • -
      • - FIXED - Fixes - #400 - — Reset TO commit also resets chosen one -
        -
        • -
      • - FIXED - Fixes - #399 - — "Open x in Remote" commands aren't always available -
        -
        • -
      • - FIXED - Fixes - #397 - — Error while opening the gitlens view using - Open View command -
        -
        • -
      • - FIXED - Fixes - #391 - — GitLens adds some settings in settings.json -
        -
        • -
      • - FIXED - Fixes - #343 - — Can't show blame when VSCode starts on branch without upstream — thanks to - PR #390 - by - ryenus -
        -
        • -
      • - FIXED - Fixes - #392 - — unable to contribute if default script shell is sh — thanks to - PR #393 - by - Cédric Malard -
        -
        • -
      • - FIXED - Fixes more instances of - #295 - and - #318 - — Any error encountered during the search for repositories could cause GitLens to die -
        -
        • -
      • - FIXED - Fixes issue with the - chorded keyboard shortcut for the - Compare File with Previous Revision command ( - gitlens.diffWithPreviousInDiff) — from - #395 -
        -
        • -
      • - FIXED - Fixes - bronze typo thanks to - PR #361 - by - Cory Forsyth -
        -
        • -
      • - FIXED - Fixes - individually typo thanks to - PR #364 - by - Brett Cannon -
        -
        • -
      • - FIXED - Fixes issue where comparing previous revision during a merge/rebase conflict failed to show the correct contents -
        -
        • -
      • - FIXED - Fixes issue with the current line blame toggle not working when current line blame starts disabled -
        -
        • -
      • - FIXED - Fixes various issues when not on a branch -
        -
        • -
      • - FIXED - Fixes many issues where commands wouldn't work if the active file wasn't part of an open repository — now GitLens will - try to find the best repository otherwise it will open a repository quick pick menu if there - is more than one -
        -
        • -
      • - FIXED - Fixes the - Open Working File command ( - gitlens.openWorkingFile) not always showing in the editor toolbar when appropriate -
        -
        • - -
      • - 8.2 - APRIL  2018 -
        -
        • -
      • - NEW - Adds new stand-alone - GitLens File History explorer to visualize the history of the current file — undocked - version of the - GitLens explorer history view -
        - GitLens File History explorer -
        -
        • -
      • - NEW - Adds richer tooltips to the - GitLens and - GitLens Results explorers, and richer working tree and upstream status to the - GitLens explorer -
        - Richer tooltips and working tree and upstream status -
        -
        • -
      • - NEW - Adds an indicator to the - GitLens explorer's branch history to mark the synchronization point between the local - and remote branch (if available) -
        - Branch upstream indicator -
        -
        • -
      • - NEW - Adds ability to easily switch between relative and absolute dates via the - gitlens.defaultDateStyle settings — closes - #312 -
        - General settings -
        -
        • -
      • - NEW - Adds annotation format settings ( - gitlens.*.format) to the interactive settings editor -
        - Annotation format settings -
        -
        • -
      • - NEW - Adds new - gitlens.currentLine.scrollable setting to specify whether the current line blame - annotation can be scrolled into view when it is outside the viewport — closes - #149, - #290, - #265 -
        - Allow scrolling to annotation setting -
        -
        • -
      • - NEW - Adds - gitlens.statusBar.reduceFlicker setting to the interactive settings editor -
        - Reduce status bar flashing setting -
        -
        • -
      • - FIXED - Fixes - #314 - — Toggle line annotation doesn't work properly -
        -
        • -
      • - FIXED - Fixes - #310 - — "via Terminal" commands need quoting around work directory -
        -
        • -
      • - FIXED - Fixes issues with the active repository in the - GitLens explorer failed to update properly -
        -
        • -
      • - FIXED - Fixes issues with - Open File, - Open Revision, and - Show File History commands and images and other binary files -
        -
        • -
      • - FIXED - Fixes issues preventing nodes in the - GitLens explorer from expanding properly in certain cases -
        -
        • -
      • - FIXED - Fixes issues when refreshing nodes in the - GitLens Results explorer -
        -
        • - -
      • - 8.1 - MARCH  2018 -
        -
        • -
      • - NEW - Adds automatic issue linking to Bitbucket, GitHub, GitLab, and Visual Studio Team Services for commit messages in hovers -
        - Issue linking in commit messages -
        -
        • -
      • - NEW - Adds support to toggle annotations for each file individually or for all files at once — closes - #289 -
        - Annotations toggle -
        -
        • -
      • - NEW - Adds icons to remotes in the - GitLens explorer based on the remote service provider -
        -
        • -
      • - NEW - Adds multi-cursor support to current line annotations — closes - #291 -
        -
        • -
      • - IMPROVED - Renames - Compare Selected Ancestor with Working Tree command to - Compare Ancestry with Working Tree and removes the need to select a branch first, since - all compares are performed with the working tree — closes - #279 -
        -
        • -
      • - FIXED - Fixes - #294 - — Keyboard shortcuts will now default to - chorded to avoid conflicts. Only affects new installs or if you remove the - gitlens.keymap setting -
        -
        • - -
      • - 8.0 - FEBRUARY  2018 -
        -
        • -
      • - NEW - Brand new welcome experience — you're looking at it -
        -
        • -
      • - NEW - Brand new interactive - settings - editor - — GitLens is easier than ever to customize to suit your needs -
        - -
        -
        • -
      • - NEW - Brand new - website — check it - out! -
        -
        • -
      • - NEW - Adds a tree layout option to branches in the - GitLens explorer — thanks to - Yukai Huang! -
        -
        • -
      • - IMPROVED - Reworked settings — clearer, simpler settings -
        -
        • -
      • - FIXED - Previous settings will now be migrated properly — sorry everyone 😢 -

      - See the - release - notes - for the full set of changes + See the + release notes + + for the full set of changes

      @@ -1090,131 +79,167 @@

      - GitLens is - an - open-source + GitLens + is an open-source extension for Visual Studio Code created by Eric Amodio - . While GitLens is generously offered to everyone free of charge, if you find it useful please - consider - supporting it. + . While GitLens is generously offered to everyone free of charge, if you find it useful + please consider supporting + it.

      - 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. Dive right in and see how GitLens can help! + 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. Dive right in and see how GitLens can + help!

      -

      Here are just some of the features that GitLens provides, +

      + Here are just some of the features that GitLens provides,

        -
      • a - - GitLens explorer to navigate and explore repositories
        • -
      • a - - GitLens File History explorer to navigate and explore file histories +
      • + a + Repositories explorer + + to visualize, navigate, and explore Git repositories +
        • +
      • + a + File History explorer + + to visualize, navigate, and explore the revision history of the current file
        • -
      • an on-demand - - GitLens Results explorer to navigate and explore commits, histories, and - searches, or visualize comparisons between branches, tags, commits, and more
        • -
      • authorship - code - lens - showing the most recent commit and # of authors to the top of files and/or on code +
      • + a + Line History explorer + + to visualize, navigate, and explore the revision history of the selected lines of + current file +
        • +
      • + an on-demand + Results explorer + + to navigate and explore commits, histories, and searches, or visualize comparisons + between branches, tags, commits, and more +
        • +
      • + + authorship 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 annotation at the end of the line
        • -
      • on-demand - gutter - blame - annotations, including a heatmap, for the whole file +
      • + an unobtrusive + current line blame + + annotation at the end of the line +
        • +
      • + on-demand + + gutter blame + + annotations, including a heatmap, for the whole file +
        • +
      • + on-demand + gutter heatmap + + annotations to show how recently lines were changed, relative to all the other + changes in the file and to now (hot vs. cold) +
        • +
      • + detailed blame information accessible via hovers
        • -
      • on-demand - gutter - heatmap - annotations to show how recently lines were changed, relative to all the other changes - in the file and to now (hot vs. cold) +
      • + on-demand + recent changes + + annotations to highlight lines changed by the most recent commit
        • -
      • detailed blame information accessible via - hovers +
      • + a + status bar blame + + annotation showing author and date for the current line
        • -
      • on-demand - recent - changes - annotations to highlight lines changed by the most recent commit
        • -
      • a - status - bar blame annotation showing author and date for the current line +
      • + + commit search + + — by message, author, filename, commit id, or code changes +
        • +
      • + many powerful commands for exploring commits and histories, comparing and + navigating revisions, stash access, repository status, etc
      • - commit - search - — by message, author, filename, commit id, or code changes
        • -
      • many powerful commands for exploring commits and histories, comparing and navigating - revisions, stash access, repository status, etc
        • -
      • and so much - more + and so much more

      -

      GitLens is powerful, feature rich, and highly customizable to meet your specific - needs — find code lens intrusive or the current line blame annotation distracting — - no problem, it is quick and easy to turn them off or change how they behave via the built-in - GitLens - Settings - editor, an interactive editor covering many of GitLens' powerful settings. While for more - advanced customizations, refer to the - GitLens - settings docs - and edit your - User - Settings +

      + GitLens is powerful, feature rich, and highly customizable to meet your specific needs + — find code lens intrusive or the current line blame annotation distracting — + no problem, it is quick and easy to turn them off or change how they behave via the + built-in + GitLens Settings + editor, an interactive editor covering many of GitLens' powerful + settings. + While for more advanced customizations, refer to the + GitLens settings docs + and edit your + User Settings .

      Support GitLens

      - While GitLens is generously offered to everyone free of charge, if you find it useful please consider supporting it. + While GitLens is generously offered to everyone free of charge, if you find it useful + please consider supporting it.

      I've been building GitLens in my spare time 1 - for almost 2 years now. From its very humble beginnings, GitLens has grown wildly beyond - my expectations — in both its reach as well as its demands on my time and attention. While - I enjoy giving my free time and attention to GitLens' development and growth, I would like to - do even more. + for almost 2 years now. From its very humble beginnings, GitLens has grown wildly + beyond my expectations — in both its reach as well as its demands on my time and + attention. While I enjoy giving my free time and attention to GitLens' development and + growth, I would like to do even more.

      Show Your Support ❤

      - To my incredible backers — thank you so much for your contributions. I am truly humbled by your generosity and support. - Please know that your support plays a important role in helping me realize GitLens' potential - in making developer's lives easier. + To my incredible backers — thank you so much for your contributions. I am truly + humbled by your generosity and support. + Please know that your support plays a important role in helping me realize GitLens' + potential in making developer's lives easier.

      - If you'd like to join them in supporting GitLens, please consider the following — feel free to choose more than one. - 😉 + If you'd like to join them in supporting GitLens, please consider the following — + feel free to choose more than one. 😉

      - Become - a Sponsor - Donations - via PayPal - Donations - via Cash App + Become a Sponsor + Donations via PayPal + Donations via Cash App
      • - Write - a Review + + Write a Review +
      • - Star - or Fork me on GitHub + + Star or Fork me on GitHub +
      • Follow me on Twitter @@ -1227,35 +252,32 @@

        Customize

      Learn

      @@ -1265,21 +287,23 @@

      Show Your Support

      - Become - a Sponsor - Donations - via PayPal - Donations - via Cash App + Become a Sponsor + Donations via PayPal + Donations via Cash App
      • - Write - a Review + + Write a Review +
      • - Star - or Fork me on GitHub + + Star or Fork me on GitHub +
      • Follow me on Twitter diff --git a/src/views/explorer.ts b/src/views/explorer.ts index 034e237..ef08df7 100644 --- a/src/views/explorer.ts +++ b/src/views/explorer.ts @@ -15,10 +15,10 @@ import { Container } from '../container'; import { Logger } from '../logger'; import { RefreshNodeCommandArgs } from './explorerCommands'; import { FileHistoryExplorer } from './fileHistoryExplorer'; -import { GitExplorer } from './gitExplorer'; import { LineHistoryExplorer } from './lineHistoryExplorer'; import { ExplorerNode } from './nodes'; import { isPageable } from './nodes/explorerNode'; +import { RepositoriesExplorer } from './repositoriesExplorer'; import { ResultsExplorer } from './resultsExplorer'; export enum RefreshReason { @@ -27,7 +27,7 @@ export enum RefreshReason { VisibilityChanged = 'VisibilityChanged' } -export type Explorer = GitExplorer | FileHistoryExplorer | LineHistoryExplorer | ResultsExplorer; +export type Explorer = RepositoriesExplorer | FileHistoryExplorer | LineHistoryExplorer | ResultsExplorer; export abstract class ExplorerBase implements TreeDataProvider, Disposable { protected _onDidChangeTreeData = new EventEmitter(); diff --git a/src/views/fileHistoryExplorer.ts b/src/views/fileHistoryExplorer.ts index 1a43273..542b7df 100644 --- a/src/views/fileHistoryExplorer.ts +++ b/src/views/fileHistoryExplorer.ts @@ -1,6 +1,6 @@ 'use strict'; import { commands, ConfigurationChangeEvent } from 'vscode'; -import { configuration, IExplorersConfig, IFileHistoryExplorerConfig } from '../configuration'; +import { configuration, ExplorersConfig, FileHistoryExplorerConfig } from '../configuration'; import { CommandContext, setCommandContext } from '../constants'; import { Container } from '../container'; import { ExplorerBase, RefreshReason } from './explorer'; @@ -67,7 +67,7 @@ export class FileHistoryExplorer extends ExplorerBase { } } - get config(): IExplorersConfig & IFileHistoryExplorerConfig { + get config(): ExplorersConfig & FileHistoryExplorerConfig { return { ...Container.config.explorers, ...Container.config.fileHistoryExplorer }; } diff --git a/src/views/lineHistoryExplorer.ts b/src/views/lineHistoryExplorer.ts index 7d05ab7..c02fece 100644 --- a/src/views/lineHistoryExplorer.ts +++ b/src/views/lineHistoryExplorer.ts @@ -1,6 +1,6 @@ 'use strict'; import { commands, ConfigurationChangeEvent } from 'vscode'; -import { configuration, IExplorersConfig, ILineHistoryExplorerConfig } from '../configuration'; +import { configuration, ExplorersConfig, LineHistoryExplorerConfig } from '../configuration'; import { CommandContext, setCommandContext } from '../constants'; import { Container } from '../container'; import { ExplorerBase, RefreshReason } from './explorer'; @@ -66,7 +66,7 @@ export class LineHistoryExplorer extends ExplorerBase { } } - get config(): IExplorersConfig & ILineHistoryExplorerConfig { + get config(): ExplorersConfig & LineHistoryExplorerConfig { return { ...Container.config.explorers, ...Container.config.lineHistoryExplorer }; } diff --git a/src/views/nodes/branchNode.ts b/src/views/nodes/branchNode.ts index a7c34e4..1fdf73c 100644 --- a/src/views/nodes/branchNode.ts +++ b/src/views/nodes/branchNode.ts @@ -5,7 +5,7 @@ import { GlyphChars } from '../../constants'; import { Container } from '../../container'; import { GitBranch, GitUri } from '../../git/gitService'; import { Arrays, Iterables } from '../../system'; -import { GitExplorer } from '../gitExplorer'; +import { RepositoriesExplorer } from '../repositoriesExplorer'; import { CommitNode } from './commitNode'; import { MessageNode, ShowMoreNode } from './common'; import { ExplorerNode, ExplorerRefNode, PageableExplorerNode, ResourceType } from './explorerNode'; @@ -20,7 +20,7 @@ export class BranchNode extends ExplorerRefNode implements PageableExplorerNode public readonly branch: GitBranch, uri: GitUri, parent: ExplorerNode, - public readonly explorer: GitExplorer, + public readonly explorer: RepositoriesExplorer, private readonly _markCurrent: boolean = true ) { super(uri, parent); diff --git a/src/views/nodes/branchesNode.ts b/src/views/nodes/branchesNode.ts index 1d1291d..bfe434d 100644 --- a/src/views/nodes/branchesNode.ts +++ b/src/views/nodes/branchesNode.ts @@ -4,7 +4,7 @@ import { ExplorerBranchesLayout } from '../../configuration'; import { Container } from '../../container'; import { GitUri, Repository } from '../../git/gitService'; import { Arrays, Iterables } from '../../system'; -import { GitExplorer } from '../gitExplorer'; +import { RepositoriesExplorer } from '../repositoriesExplorer'; import { BranchNode } from './branchNode'; import { BranchOrTagFolderNode } from './branchOrTagFolderNode'; import { ExplorerNode, ResourceType } from './explorerNode'; @@ -16,7 +16,7 @@ export class BranchesNode extends ExplorerNode { uri: GitUri, public readonly repo: Repository, parent: ExplorerNode, - public readonly explorer: GitExplorer + public readonly explorer: RepositoriesExplorer ) { super(uri, parent); } diff --git a/src/views/nodes/folderNode.ts b/src/views/nodes/folderNode.ts index 1999bfe..6c8f05d 100644 --- a/src/views/nodes/folderNode.ts +++ b/src/views/nodes/folderNode.ts @@ -1,6 +1,6 @@ 'use strict'; import { ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; -import { ExplorerFilesLayout, IExplorersFilesConfig } from '../../configuration'; +import { ExplorerFilesLayout, ExplorersFilesConfig } from '../../configuration'; import { GitUri } from '../../git/gitService'; import { Arrays, Objects } from '../../system'; import { Explorer } from '../explorer'; @@ -82,7 +82,7 @@ export class FolderNode extends ExplorerNode { } static getFileNesting( - config: IExplorersFilesConfig, + config: ExplorersFilesConfig, children: T[], isRoot: boolean ): ExplorerFilesLayout { diff --git a/src/views/nodes/remoteNode.ts b/src/views/nodes/remoteNode.ts index d74f0c4..ec13baa 100644 --- a/src/views/nodes/remoteNode.ts +++ b/src/views/nodes/remoteNode.ts @@ -5,7 +5,7 @@ import { GlyphChars } from '../../constants'; import { Container } from '../../container'; import { GitRemote, GitRemoteType, GitUri, Repository } from '../../git/gitService'; import { Arrays, Iterables } from '../../system'; -import { GitExplorer } from '../gitExplorer'; +import { RepositoriesExplorer } from '../repositoriesExplorer'; import { BranchNode } from './branchNode'; import { BranchOrTagFolderNode } from './branchOrTagFolderNode'; import { ExplorerNode, ResourceType } from './explorerNode'; @@ -16,7 +16,7 @@ export class RemoteNode extends ExplorerNode { uri: GitUri, public readonly repo: Repository, parent: ExplorerNode, - public readonly explorer: GitExplorer + public readonly explorer: RepositoriesExplorer ) { super(uri, parent); } diff --git a/src/views/nodes/remotesNode.ts b/src/views/nodes/remotesNode.ts index 9b5103c..1bf3b70 100644 --- a/src/views/nodes/remotesNode.ts +++ b/src/views/nodes/remotesNode.ts @@ -3,7 +3,7 @@ import { TreeItem, TreeItemCollapsibleState } from 'vscode'; import { Container } from '../../container'; import { GitUri, Repository } from '../../git/gitService'; import { Iterables } from '../../system'; -import { GitExplorer } from '../gitExplorer'; +import { RepositoriesExplorer } from '../repositoriesExplorer'; import { MessageNode } from './common'; import { ExplorerNode, ResourceType } from './explorerNode'; import { RemoteNode } from './remoteNode'; @@ -13,7 +13,7 @@ export class RemotesNode extends ExplorerNode { uri: GitUri, public readonly repo: Repository, parent: ExplorerNode, - public readonly explorer: GitExplorer + public readonly explorer: RepositoriesExplorer ) { super(uri, parent); } diff --git a/src/views/nodes/repositoriesNode.ts b/src/views/nodes/repositoriesNode.ts index 0c2f294..4c53d36 100644 --- a/src/views/nodes/repositoriesNode.ts +++ b/src/views/nodes/repositoriesNode.ts @@ -4,15 +4,15 @@ import { Container } from '../../container'; import { GitUri } from '../../git/gitService'; import { Logger } from '../../logger'; import { Functions } from '../../system'; -import { GitExplorer } from '../gitExplorer'; +import { RepositoriesExplorer } from '../repositoriesExplorer'; import { MessageNode } from './common'; import { ExplorerNode, ResourceType, SubscribeableExplorerNode, unknownGitUri } from './explorerNode'; import { RepositoryNode } from './repositoryNode'; -export class RepositoriesNode extends SubscribeableExplorerNode { +export class RepositoriesNode extends SubscribeableExplorerNode { private _children: (RepositoryNode | MessageNode)[] | undefined; - constructor(explorer: GitExplorer) { + constructor(explorer: RepositoriesExplorer) { super(unknownGitUri, undefined, explorer); } diff --git a/src/views/nodes/repositoryNode.ts b/src/views/nodes/repositoryNode.ts index e36d27e..0191e5e 100644 --- a/src/views/nodes/repositoryNode.ts +++ b/src/views/nodes/repositoryNode.ts @@ -15,7 +15,7 @@ import { } from '../../git/gitService'; import { Logger } from '../../logger'; import { Dates, Functions, Strings } from '../../system'; -import { GitExplorer } from '../gitExplorer'; +import { RepositoriesExplorer } from '../repositoriesExplorer'; import { BranchesNode } from './branchesNode'; import { BranchNode } from './branchNode'; import { MessageNode } from './common'; @@ -26,7 +26,7 @@ import { StatusFilesNode } from './statusFilesNode'; import { StatusUpstreamNode } from './statusUpstreamNode'; import { TagsNode } from './tagsNode'; -export class RepositoryNode extends SubscribeableExplorerNode { +export class RepositoryNode extends SubscribeableExplorerNode { private _children: ExplorerNode[] | undefined; private _lastFetched: number = 0; private _status: Promise; @@ -35,7 +35,7 @@ export class RepositoryNode extends SubscribeableExplorerNode { uri: GitUri, public readonly repo: Repository, parent: ExplorerNode, - explorer: GitExplorer + explorer: RepositoriesExplorer ) { super(uri, parent, explorer); diff --git a/src/views/nodes/statusFilesNode.ts b/src/views/nodes/statusFilesNode.ts index 4d3b23f..1c0b4f1 100644 --- a/src/views/nodes/statusFilesNode.ts +++ b/src/views/nodes/statusFilesNode.ts @@ -14,7 +14,7 @@ import { IGitStatusFileWithCommit } from '../../git/gitService'; import { Arrays, Iterables, Objects, Strings } from '../../system'; -import { GitExplorer } from '../gitExplorer'; +import { RepositoriesExplorer } from '../repositoriesExplorer'; import { ExplorerNode, ResourceType } from './explorerNode'; import { FolderNode, IFileExplorerNode } from './folderNode'; import { StatusFileCommitsNode } from './statusFileCommitsNode'; @@ -26,7 +26,7 @@ export class StatusFilesNode extends ExplorerNode { public readonly status: GitStatus, public readonly range: string | undefined, parent: ExplorerNode, - public readonly explorer: GitExplorer + public readonly explorer: RepositoriesExplorer ) { super(GitUri.fromRepoPath(status.repoPath), parent); this.repoPath = status.repoPath; diff --git a/src/views/nodes/statusUpstreamNode.ts b/src/views/nodes/statusUpstreamNode.ts index abcdb29..49b0e47 100644 --- a/src/views/nodes/statusUpstreamNode.ts +++ b/src/views/nodes/statusUpstreamNode.ts @@ -3,7 +3,7 @@ import { TreeItem, TreeItemCollapsibleState } from 'vscode'; import { Container } from '../../container'; import { GitStatus, GitUri } from '../../git/gitService'; import { Iterables, Strings } from '../../system'; -import { GitExplorer } from '../gitExplorer'; +import { RepositoriesExplorer } from '../repositoriesExplorer'; import { CommitNode } from './commitNode'; import { ShowMoreNode } from './common'; import { ExplorerNode, PageableExplorerNode, ResourceType } from './explorerNode'; @@ -16,7 +16,7 @@ export class StatusUpstreamNode extends ExplorerNode implements PageableExplorer public readonly status: GitStatus, public readonly direction: 'ahead' | 'behind', parent: ExplorerNode, - public readonly explorer: GitExplorer + public readonly explorer: RepositoriesExplorer ) { super(GitUri.fromRepoPath(status.repoPath), parent); } diff --git a/src/views/nodes/tagNode.ts b/src/views/nodes/tagNode.ts index f2f3bd7..6ea0bb8 100644 --- a/src/views/nodes/tagNode.ts +++ b/src/views/nodes/tagNode.ts @@ -4,7 +4,7 @@ import { ExplorerBranchesLayout } from '../../configuration'; import { Container } from '../../container'; import { GitTag, GitUri } from '../../git/gitService'; import { Iterables } from '../../system'; -import { GitExplorer } from '../gitExplorer'; +import { RepositoriesExplorer } from '../repositoriesExplorer'; import { CommitNode } from './commitNode'; import { MessageNode, ShowMoreNode } from './common'; import { ExplorerNode, ExplorerRefNode, PageableExplorerNode, ResourceType } from './explorerNode'; @@ -17,7 +17,7 @@ export class TagNode extends ExplorerRefNode implements PageableExplorerNode { public readonly tag: GitTag, uri: GitUri, parent: ExplorerNode, - public readonly explorer: GitExplorer + public readonly explorer: RepositoriesExplorer ) { super(uri, parent); } diff --git a/src/views/nodes/tagsNode.ts b/src/views/nodes/tagsNode.ts index 2642709..85c3422 100644 --- a/src/views/nodes/tagsNode.ts +++ b/src/views/nodes/tagsNode.ts @@ -4,7 +4,7 @@ import { ExplorerBranchesLayout } from '../../configuration'; import { Container } from '../../container'; import { GitUri, Repository } from '../../git/gitService'; import { Arrays } from '../../system'; -import { GitExplorer } from '../gitExplorer'; +import { RepositoriesExplorer } from '../repositoriesExplorer'; import { BranchOrTagFolderNode } from './branchOrTagFolderNode'; import { MessageNode } from './common'; import { ExplorerNode, ResourceType } from './explorerNode'; @@ -15,7 +15,7 @@ export class TagsNode extends ExplorerNode { uri: GitUri, public readonly repo: Repository, parent: ExplorerNode, - public readonly explorer: GitExplorer + public readonly explorer: RepositoriesExplorer ) { super(uri, parent); } diff --git a/src/views/gitExplorer.ts b/src/views/repositoriesExplorer.ts similarity index 68% rename from src/views/gitExplorer.ts rename to src/views/repositoriesExplorer.ts index f19f185..54823f3 100644 --- a/src/views/gitExplorer.ts +++ b/src/views/repositoriesExplorer.ts @@ -1,6 +1,6 @@ 'use strict'; import { commands, ConfigurationChangeEvent, Event, EventEmitter } from 'vscode'; -import { configuration, ExplorerFilesLayout, IExplorersConfig, IGitExplorerConfig } from '../configuration'; +import { configuration, ExplorerFilesLayout, ExplorersConfig, RepositoriesExplorerConfig } from '../configuration'; import { CommandContext, setCommandContext, WorkspaceState } from '../constants'; import { Container } from '../container'; import { ExplorerBase, RefreshReason } from './explorer'; @@ -8,9 +8,9 @@ import { RefreshNodeCommandArgs } from './explorerCommands'; import { RepositoriesNode } from './nodes'; import { ExplorerNode } from './nodes/explorerNode'; -export class GitExplorer extends ExplorerBase { +export class RepositoriesExplorer extends ExplorerBase { constructor() { - super('gitlens.gitExplorer'); + super('gitlens.repositoriesExplorer'); } private _onDidChangeAutoRefresh = new EventEmitter(); @@ -51,12 +51,12 @@ export class GitExplorer extends ExplorerBase { commands.registerCommand( this.getQualifiedCommand('setAutoRefreshToOn'), - () => this.setAutoRefresh(Container.config.gitExplorer.autoRefresh, true), + () => this.setAutoRefresh(Container.config.repositoriesExplorer.autoRefresh, true), this ); commands.registerCommand( this.getQualifiedCommand('setAutoRefreshToOff'), - () => this.setAutoRefresh(Container.config.gitExplorer.autoRefresh, false), + () => this.setAutoRefresh(Container.config.repositoriesExplorer.autoRefresh, false), this ); } @@ -66,7 +66,7 @@ export class GitExplorer extends ExplorerBase { if ( !initializing && - !configuration.changed(e, configuration.name('gitExplorer').value) && + !configuration.changed(e, configuration.name('repositoriesExplorer').value) && !configuration.changed(e, configuration.name('explorers').value) && !configuration.changed(e, configuration.name('defaultGravatarsStyle').value) ) { @@ -75,17 +75,17 @@ export class GitExplorer extends ExplorerBase { if ( initializing || - configuration.changed(e, configuration.name('gitExplorer')('enabled').value) || - configuration.changed(e, configuration.name('gitExplorer')('location').value) + configuration.changed(e, configuration.name('repositoriesExplorer')('enabled').value) || + configuration.changed(e, configuration.name('repositoriesExplorer')('location').value) ) { - setCommandContext(CommandContext.GitExplorer, this.config.enabled ? this.config.location : false); + setCommandContext(CommandContext.RepositoriesExplorer, this.config.enabled ? this.config.location : false); } - if (configuration.changed(e, configuration.name('gitExplorer')('autoRefresh').value)) { - void this.setAutoRefresh(Container.config.gitExplorer.autoRefresh); + if (configuration.changed(e, configuration.name('repositoriesExplorer')('autoRefresh').value)) { + void this.setAutoRefresh(Container.config.repositoriesExplorer.autoRefresh); } - if (initializing || configuration.changed(e, configuration.name('gitExplorer')('location').value)) { + if (initializing || configuration.changed(e, configuration.name('repositoriesExplorer')('location').value)) { this.initialize(this.config.location); } @@ -97,12 +97,12 @@ export class GitExplorer extends ExplorerBase { get autoRefresh() { return ( this.config.autoRefresh && - Container.context.workspaceState.get(WorkspaceState.GitExplorerAutoRefresh, true) + Container.context.workspaceState.get(WorkspaceState.RepositoriesExplorerAutoRefresh, true) ); } - get config(): IExplorersConfig & IGitExplorerConfig { - return { ...Container.config.explorers, ...Container.config.gitExplorer }; + get config(): ExplorersConfig & RepositoriesExplorerConfig { + return { ...Container.config.explorers, ...Container.config.repositoriesExplorer }; } private fetchAll() { @@ -115,21 +115,24 @@ export class GitExplorer extends ExplorerBase { if (enabled) { if (workspaceEnabled === undefined) { workspaceEnabled = Container.context.workspaceState.get( - WorkspaceState.GitExplorerAutoRefresh, + WorkspaceState.RepositoriesExplorerAutoRefresh, true ); } else { - await Container.context.workspaceState.update(WorkspaceState.GitExplorerAutoRefresh, workspaceEnabled); + await Container.context.workspaceState.update( + WorkspaceState.RepositoriesExplorerAutoRefresh, + workspaceEnabled + ); } } - setCommandContext(CommandContext.GitExplorerAutoRefresh, enabled && workspaceEnabled); + setCommandContext(CommandContext.RepositoriesExplorerAutoRefresh, enabled && workspaceEnabled); this._onDidChangeAutoRefresh.fire(); } private setFilesLayout(layout: ExplorerFilesLayout) { - return configuration.updateEffective(configuration.name('gitExplorer')('files')('layout').value, layout); + return configuration.updateEffective(configuration.name('repositoriesExplorer')('files')('layout').value, layout); } } diff --git a/src/views/resultsExplorer.ts b/src/views/resultsExplorer.ts index 711d9ad..f925083 100644 --- a/src/views/resultsExplorer.ts +++ b/src/views/resultsExplorer.ts @@ -1,6 +1,6 @@ 'use strict'; import { commands, ConfigurationChangeEvent } from 'vscode'; -import { configuration, ExplorerFilesLayout, IExplorersConfig, IResultsExplorerConfig } from '../configuration'; +import { configuration, ExplorerFilesLayout, ExplorersConfig, ResultsExplorerConfig } from '../configuration'; import { CommandContext, GlyphChars, setCommandContext, WorkspaceState } from '../constants'; import { Container } from '../container'; import { GitLog, GitLogCommit } from '../git/gitService'; @@ -92,7 +92,7 @@ export class ResultsExplorer extends ExplorerBase { } } - get config(): IExplorersConfig & IResultsExplorerConfig { + get config(): ExplorersConfig & ResultsExplorerConfig { return { ...Container.config.explorers, ...Container.config.resultsExplorer }; } diff --git a/src/webviews/settingsEditor.ts b/src/webviews/settingsEditor.ts index c0edfbb..b4df165 100644 --- a/src/webviews/settingsEditor.ts +++ b/src/webviews/settingsEditor.ts @@ -1,6 +1,6 @@ 'use strict'; import { commands, workspace } from 'vscode'; -import { configuration, IConfig } from '../configuration'; +import { Config, configuration } from '../configuration'; import { SettingsBootstrap } from '../ui/ipc'; import { WebviewEditor } from './webviewEditor'; @@ -24,7 +24,7 @@ export class SettingsEditor extends WebviewEditor { getBootstrap() { return { // Make sure to get the raw config, not from the container which has the modes mixed in - config: configuration.get(), + config: configuration.get(), scope: 'user', scopes: this.getAvailableScopes() } as SettingsBootstrap; diff --git a/src/webviews/webviewEditor.ts b/src/webviews/webviewEditor.ts index a17143e..2ec6d67 100644 --- a/src/webviews/webviewEditor.ts +++ b/src/webviews/webviewEditor.ts @@ -11,7 +11,7 @@ import { window, workspace } from 'vscode'; -import { configuration, IConfig } from '../configuration'; +import { Config, configuration } from '../configuration'; import { Container } from '../container'; import { Logger } from '../logger'; import { Message, SettingsChangedMessage } from '../ui/ipc'; @@ -175,7 +175,7 @@ export abstract class WebviewEditor implements Disposable { return this.postMessage( { type: 'settingsChanged', - config: configuration.get() + config: configuration.get() } as SettingsChangedMessage, 'config' );