diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cdd9ae..cb6c122 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [8.3.1] - 2018-05-18 +### Added +- Adds the ability to control where the *GitLens*, *GitLens History*, and *GitLens Results* explorers are shown 🎉 — closes [#213](https://github.com/eamodio/vscode-gitlens/issues/213), [#377](https://github.com/eamodio/vscode-gitlens/issues/377) + - Adds `gitlens.gitExplorer.location` setting to the interactive settings editor to specify where the *GitLens* explorer is shown — either in the *Explorer* or *Source Control* view + - Adds `gitlens.historyExplorer.location` setting to the interactive settings editor to specify where the *GitLens History* explorer is shown — either in the *Explorer* or *Source Control* view + - Adds `gitlens.resultsExplorer.location` setting to the interactive settings editor to specify where the *GitLens Results* view is shown — either in the *Explorer* or *Source Control* view + +### Fixed +- Fixes [#372](https://github.com/eamodio/vscode-gitlens/issues/372) - Wrong URL to VSTS work item when using hash work item id in commit + ## [8.3.0] - 2018-05-17 ### Added - Adds user-defined modes for quickly toggling between sets of settings @@ -22,7 +32,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ![modes settings](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-modes-settings.png) - - Adds `gitlens.mode.active` settings to specify the active GitLens mode, if any + - Adds `gitlens.mode.active` setting to specify the active GitLens mode, if any - Adds `gitlens.modes` setting to specify the user-defined GitLens modes - Adds an icon for the *Compare File with Previous Revision* command (`gitlens.diffWithPrevious`) and moves it into the editor toolbar - Adds an icon for the *Compare File with Next Revision* command (`gitlens.diffWithNext`) and moves it into the editor toolbar diff --git a/README.md b/README.md index 29e216d..f1b6cbe 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,10 @@ # What's new in GitLens 8 ## 8.3 — May 2018 -- Moves the *GitLens*, *GitLens History*, and *GitLens Results* explorers under the Source Control activity (in the sidebar) 🎉 — closes [#213](https://github.com/eamodio/vscode-gitlens/issues/213) +- Adds the ability to control where the *GitLens*, *GitLens History*, and *GitLens Results* explorers are shown 🎉 — closes [#213](https://github.com/eamodio/vscode-gitlens/issues/213), [#377](https://github.com/eamodio/vscode-gitlens/issues/377) + - Adds `gitlens.gitExplorer.location` setting to the interactive settings editor to specify where the *GitLens* explorer is shown — either in the *Explorer* or *Source Control* view + - Adds `gitlens.historyExplorer.location` setting to the interactive settings editor to specify where the *GitLens History* explorer is shown — either in the *Explorer* or *Source Control* view + - Adds `gitlens.resultsExplorer.location` setting to the interactive settings editor to specify where the *GitLens Results* view is shown — either in the *Explorer* or *Source Control* view - 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) @@ -31,7 +34,7 @@ ![modes settings](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/cl-modes-settings.png) - - Adds `gitlens.mode.active` settings to specify the active GitLens mode, if any + - Adds `gitlens.mode.active` setting to specify the active GitLens mode, if any - Adds `gitlens.modes` setting to specify the user-defined GitLens modes - Adds an icon for the *Compare File with Previous Revision* command (`gitlens.diffWithPrevious`) and moves it into the editor toolbar - Adds an icon for the *Compare File with Next Revision* command (`gitlens.diffWithNext`) and moves it into the editor toolbar @@ -58,6 +61,7 @@ - Fixes [#366](https://github.com/eamodio/vscode-gitlens/issues/366) - Running a GitLens command from a keybinding fails - Fixes [#155](https://github.com/eamodio/vscode-gitlens/issues/155) - Navigating file diffs with `alt+,` gets stuck - Fixes [#359](https://github.com/eamodio/vscode-gitlens/issues/359) - Show changes of an added file in the first commit +- Fixes [#372](https://github.com/eamodio/vscode-gitlens/issues/372) - Wrong URL to VSTS work item when using hash work item id in commit - Fixes *bronze* typo thanks to [PR #361](https://github.com/eamodio/vscode-gitlens/pull/361) by Cory Forsyth ([@bantic](https://github.com/bantic)) - Fixes *individually* typo thanks to [PR #364](https://github.com/eamodio/vscode-gitlens/pull/364) by Brett Cannon ([@brettcannon](https://github.com/brettcannon)) - Fixes issue where comparing previous revision during a merge/rebase conflict failed to show the correct contents @@ -615,6 +619,7 @@ See also [Explorer Settings](#explorer-settings "Jump to the Explorer settings") |`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` setting 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 displaying files as `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
`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" |`gitlens.gitExplorer.view`|Specifies the starting view of the *GitLens* explorer
`auto` - shows the last selected view, defaults to `repository`
`history` - shows the commit history of the current file
`repository` - shows a repository explorer" @@ -625,6 +630,7 @@ See also [Explorer Settings](#explorer-settings "Jump to the Explorer settings") |Name | Description |-----|------------ |`gitlens.historyExplorer.enabled`|Specifies whether to show the current file history undocked in a *GitLens History* explorer +|`gitlens.historyExplorer.location`|Specifies where to show the `GitLens History` explorer
`explorer` - adds to the Explorer view
`scm` - adds to the Source Control view ### GitLens Results View Settings @@ -635,6 +641,7 @@ See also [Explorer Settings](#explorer-settings "Jump to the Explorer settings") |`gitlens.resultsExplorer.files.compact`|Specifies whether to compact (flatten) unnecessary file nesting in the *GitLens Results* view
Only applies when displaying files as a `tree` or `auto` |`gitlens.resultsExplorer.files.layout`|Specifies how the *GitLens Results* view will display files
`auto` - automatically switches between displaying files as a `tree` or `list` based on the `gitlens.resultsExplorer.files.threshold` setting 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* view
Only applies when displaying files as `auto` +|`gitlens.resultsExplorer.location`|Specifies where to show the `GitLens Results` view
`explorer` - adds to the Explorer view
`scm` - adds to the Source Control view ### Explorer Settings diff --git a/package.json b/package.json index ffd84e3..2b5d43f 100644 --- a/package.json +++ b/package.json @@ -464,6 +464,16 @@ "description": "Specifies whether to include working tree files inside the `Repository Status` node of the `GitLens` explorer", "scope": "window" }, + "gitlens.gitExplorer.location": { + "type": "string", + "default": "scm", + "enum": [ + "explorer", + "scm" + ], + "description": "Specifies where to show the `GitLens` explorer\n `explorer` - adds to the Explorer view\n `scm` - adds to the Source Control view", + "scope": "window" + }, "gitlens.gitExplorer.showTrackingBranch": { "type": "boolean", "default": true, @@ -497,6 +507,16 @@ "description": "Specifies whether to show the current file history undocked in a `GitLens History` explorer", "scope": "window" }, + "gitlens.historyExplorer.location": { + "type": "string", + "default": "explorer", + "enum": [ + "explorer", + "scm" + ], + "description": "Specifies where to show the `GitLens History` explorer\n `explorer` - adds to the Explorer view\n `scm` - adds to the Source Control view", + "scope": "window" + }, "gitlens.hovers.annotations.changes": { "type": "boolean", "default": true, @@ -925,6 +945,16 @@ "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` view\nOnly applies when displaying files as `auto`", "scope": "window" }, + "gitlens.resultsExplorer.location": { + "type": "string", + "default": "explorer", + "enum": [ + "explorer", + "scm" + ], + "description": "Specifies where to show the `GitLens Results` view\n `explorer` - adds to the Explorer view\n `scm` - adds to the Source Control view", + "scope": "window" + }, "gitlens.settings.mode": { "type": "string", "default": "simple", @@ -3120,21 +3150,38 @@ } ], "views": { + "explorer": [ + { + "id": "gitlens.gitExplorer", + "name": "GitLens", + "when": "gitlens:enabled && gitlens:gitExplorer == explorer" + }, + { + "id": "gitlens.historyExplorer", + "name": "GitLens History", + "when": "gitlens:enabled && gitlens:historyExplorer == explorer" + }, + { + "id": "gitlens.resultsExplorer", + "name": "GitLens Results", + "when": "gitlens:enabled && gitlens:resultsExplorer == explorer" + } + ], "scm": [ { "id": "gitlens.gitExplorer", "name": "GitLens", - "when": "gitlens:enabled && gitlens:gitExplorer" + "when": "gitlens:enabled && gitlens:gitExplorer == scm" }, { "id": "gitlens.historyExplorer", "name": "GitLens History", - "when": "gitlens:enabled && gitlens:historyExplorer" + "when": "gitlens:enabled && gitlens:historyExplorer == scm" }, { "id": "gitlens.resultsExplorer", "name": "GitLens Results", - "when": "gitlens:enabled && gitlens:resultsExplorer" + "when": "gitlens:enabled && gitlens:resultsExplorer == scm" } ] } diff --git a/src/ui/config.ts b/src/ui/config.ts index eaee284..37f4b50 100644 --- a/src/ui/config.ts +++ b/src/ui/config.ts @@ -190,12 +190,14 @@ export interface IGitExplorerConfig { enabled: boolean; files: IExplorersFilesConfig; includeWorkingTree: boolean; + location: 'explorer' | 'scm'; showTrackingBranch: boolean; view: GitExplorerView; } export interface IHistoryExplorerConfig { enabled: boolean; + location: 'explorer' | 'scm'; } export interface IMenuConfig { @@ -236,6 +238,7 @@ export interface IModeConfig { export interface IResultsExplorerConfig { files: IExplorersFilesConfig; + location: 'explorer' | 'scm'; } export interface IRemotesConfig { diff --git a/src/ui/settings/index.html b/src/ui/settings/index.html index 4533c92..2a4afe8 100644 --- a/src/ui/settings/index.html +++ b/src/ui/settings/index.html @@ -254,6 +254,14 @@ +
+ + +
+
+ + + +
+ -