Skip to content

Commit 5295491

Browse files
committed
Preps v5.0.0-alpha
Updates dependencies
1 parent 9782a81 commit 5295491

File tree

4 files changed

+133
-71
lines changed

4 files changed

+133
-71
lines changed

CHANGELOG.md

Lines changed: 57 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,63 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
66

7-
## [4.5.0-beta] - 2017-08-27
7+
## [5.0.0-alpha] - 2017-09-02
88
### Added
9-
- Adds an all-new `Git File History` explorer to the Explorer activity -- enabled via `"gitlens.insiders": true`
10-
- Shows the commit history of the active file -- automatically tracks the active editor
11-
- Provides toolbar buttons to `Refresh`
12-
- Provides a context menu with `Open Changes`, `Compare File with Working Tree`, `Open File`, `Open File Revision`, `Open File in Remote`, `Open File Revision in Remote`, and `Show Commit Details` commands
13-
- Adds a `No stashed changes` message to the `Git Stashes` explorer when there are no stashes
9+
- Adds an all-new `GitLens` custom view to the Explorer activity
10+
11+
- `Repository View` - provides a full repository explorer
12+
13+
![GitLens Repository view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-git-custom-view-repository.png)
14+
15+
- `Status` node — provides the status of current branch
16+
- Indicates whether or not the current branch is up-to-date with its upstream branch
17+
- If the branch is out of sync, additional nodes will be shown with the specific commits ahead and/or behind the upstream
18+
19+
- `Branches` node — provides a list of the local branches
20+
- Indicates which branch is the current branch
21+
- Expand each branch to easily see its revision (commit) history
22+
- Expand each revision (commit) to quickly see the set of files changed, complete with status indicators for adds, changes, renames, and deletes
23+
- Provides a context menu on each changed file with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, `Open Revision in Remote`, and `Show Commit File Details` commands
24+
- Provides a context menu on each revision (commit) with `Open Commit in Remote`, `Copy Commit ID to Clipboard`, `Copy Commit Message to Clipboard`, `Open Files`, `Open Revisions`, and `Show Commit Details` commands
25+
- Provides a context menu on each branch with an `Open Branch in Remote` command
26+
27+
- `Remotes` node — provides a list of the remote branches
28+
- See `Branches` node above for details
29+
30+
- `Stashes` node — provides a list of stashed changes
31+
- Expand each stash to quickly see the set of files stashed, complete with status indicators for adds, changes, renames, and deletes
32+
- Provides a context menu on each stash with `Apply Stashed Changes` (confirmation required), `Delete Stashed Changes` (confirmation required), `Copy Commit Message to Clipboard`, `Open Files`, and `Open Revisions` commands
33+
- Provides a context menu on each stashed file with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, and `Show File History` commands
34+
35+
- `History View` - provides the revision history of the active file
36+
37+
![GitLens History view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-git-custom-view-history.png)
38+
39+
- Automatically updates to track the active editor
40+
- Provides a context menu on each revision (commit) with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, `Open Revision in Remote`, and `Show Commit File Details` commands
41+
42+
- Quickly switch between views using the `Switch to Repository View` or `Switch to History View` commands
43+
- Provides toolbar buttons to `Search Commits`, `Switch to Repository View` or `Switch to History View`, and `Refresh`
44+
1445
- Adds `${filePath}` token to file formatting
1546

1647
### Changed
17-
- Changes `gitlens.stashExplorer.stashFileFormat` setting to defaults to `${filePath}` for better separator handling
48+
- Renames `Compare File with Previous` command (gitlens.diffWithPrevious) to `Compare File with Previous Revision`
49+
- Renames `Compare File with Next Commit` command (`gitlens.diffWithNext`) to `Compare File with Next Revision`
50+
- Renames `Compare File with Working Tree` command (`gitlens.diffWithWorking`) to `Compare File with Working Revision`
51+
- Renames `Compare Line Commit with Previous` command (`gitlens.diffLineWithPrevious`) to `Compare Line Revision with Previous`
52+
- Renames `Compare Line Commit with Working Tree` command (`gitlens.diffLineWithWorking`) to `Compare Line Revision with Working`
53+
54+
- Renames `gitlens.stashExplorer.stashFormat` setting to `gitlens.gitExplorer.stashFormat`
55+
- Renames `gitlens.stashExplorer.stashFileFormat` setting to `gitlens.gitExplorer.stashFileFormat`
56+
- Changes `gitlens.gitExplorer.stashFileFormat` setting to defaults to `${filePath}` for better separator handling
57+
58+
## Removed
59+
- Removes the `Git Stashes` custom view view - as it's functionality has been folded into the new `GitLens` custom view
60+
- Removes the seeding of the commit search command from the clipboard
61+
62+
## Fixed
63+
- Fixes an issue where remote branches couldn't be opened properly in their remote service
1864

1965
## [4.4.3] - 2017-08-30
2066
## Fixed
@@ -63,18 +109,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
63109

64110
## [4.3.1] - 2017-07-03
65111
## Added
66-
- Adds `gitlens.stashExplorer.enabled` setting to specify whether or not to show the `Git Stashes` explorer
67-
- Adds `Toggle Git Stashes Explorer` command (`gitlens.stashExplorer.toggle`) - toggles the `Git Stashes` explorer on and off
112+
- Adds `gitlens.stashExplorer.enabled` setting to specify whether or not to show the `Git Stashes` custom view
113+
- Adds `Toggle Git Stashes Explorer` command (`gitlens.stashExplorer.toggle`) - toggles the `Git Stashes` custom view on and off
68114

69115
## Changed
70-
- Hides the `Git Stashes` explorer by default
116+
- Hides the `Git Stashes` custom view by default
71117

72118
## Fixed
73119
- Fixes [#108](https://github.com/eamodio/vscode-gitlens/issues/108) - Option to remove stash explorer from the main explorer?
74120

75121
## [4.3.0] - 2017-07-03
76122
## Added
77-
- Adds `Git Stashes` view to the Explorer activity
123+
- Adds `Git Stashes` custom view to the Explorer activity
78124

79125
![Git Stashes view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-git-stashes.png)
80126

README.md

Lines changed: 42 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -97,35 +97,55 @@ GitLens provides an unobtrusive blame annotation at the end of the current line,
9797

9898
- Adds a `Compare File with Branch...` command (`gitlens.diffWithBranch`) to compare the active file with the same file on the selected branch
9999

100-
- Adds a `Compare File with Next Commit` command (`gitlens.diffWithNext`) with a shortcut of `alt+.` to compare the active file/diff with the next commit revision
100+
- Adds a `Compare File with Next Revision` command (`gitlens.diffWithNext`) with a shortcut of `alt+.` to compare the active file/diff with the next commit revision
101101

102-
- Adds a `Compare File with Previous` command (`gitlens.diffWithPrevious`) with a shortcut of `alt+,` to compare the active file/diff with the previous commit revision
102+
- Adds a `Compare File with Previous Revision` command (`gitlens.diffWithPrevious`) with a shortcut of `alt+,` to compare the active file/diff with the previous commit revision
103103

104-
- Adds a `Compare Line Commit with Previous` command (`gitlens.diffLineWithPrevious`) with a shortcut of `shift+alt+,` to compare the active file/diff with the previous line commit revision
104+
- Adds a `Compare Line Revision with Previous` command (`gitlens.diffLineWithPrevious`) with a shortcut of `shift+alt+,` to compare the active file/diff with the previous line commit revision
105105

106106
- Adds a `Compare File with Revision...` command (`gitlens.diffWithRevision`) to compare the active file with the selected revision of the same file
107107

108-
- Adds a `Compare File with Working Tree` command (`gitlens.diffWithWorking`) with a shortcut of `shift+alt+w` to compare the most recent commit revision of the active file/diff with the working tree
108+
- Adds a `Compare File with Working Revision` command (`gitlens.diffWithWorking`) with a shortcut of `shift+alt+w` to compare the most recent commit revision of the active file/diff with the working tree
109109

110-
- Adds a `Compare Line Commit with Working Tree` command (`gitlens.diffLineWithWorking`) with a shortcut of `alt+w` to compare the commit revision of the active line with the working tree
110+
- Adds a `Compare Line Revision with Working` command (`gitlens.diffLineWithWorking`) with a shortcut of `alt+w` to compare the commit revision of the active line with the working tree
111111

112112
### Navigate and Explore
113113

114-
- Adds a [customizable](#git-file-history-explorer-settings) `Git File History` explorer to the Explorer activity -- currently [insiders](#insiders) only
114+
- Adds a [customizable](#gitlens-custom-view-settings) `GitLens` custom view to the Explorer activity
115115

116-
- Shows the commit history of the active file -- automatically tracks the active editor
117-
- Provides toolbar buttons to `Refresh`
118-
- Provides a context menu with `Open Changes`, `Compare File with Working Tree`, `Open File`, `Open File Revision`, `Open File in Remote`, `Open File Revision in Remote`, and `Show Commit Details` commands
116+
- `Repository View` - provides a full repository explorer
119117

120-
- Adds a [customizable](#git-stashes-explorer-settings) `Git Stashes` explorer to the Explorer activity
118+
![GitLens Repository view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-git-custom-view-repository.png)
121119

122-
![Git Stashes explorer](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-git-stashes.png)
120+
- `Status` node — provides the status of current branch
121+
- Indicates whether or not the current branch is up-to-date with its upstream branch
122+
- If the branch is out of sync, additional nodes will be shown with the specific commits ahead and/or behind the upstream
123123

124-
- Shows all of the stashed changes in the repository
125-
- Provides toolbar buttons to `Stash Changes` and `Refresh`
126-
- Provides a context menu with `Apply Stashed Changes` and `Delete Stashed Changes` commands — both require a confirmation
127-
- Expand each stash to quickly see the set of files changed, complete with status indicators for adds, changes, renames, and deletes
128-
- Provides a context menu with `Open Changes`, `Open File`, `Open Stashed File`, `Open File in Remote`, and `Compare File with Working Tree` commands
124+
- `Branches` node — provides a list of the local branches
125+
- Indicates which branch is the current branch
126+
- Expand each branch to easily see its revision (commit) history
127+
- Expand each revision (commit) to quickly see the set of files changed, complete with status indicators for adds, changes, renames, and deletes
128+
- Provides a context menu on each changed file with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, `Open Revision in Remote`, and `Show Commit File Details` commands
129+
- Provides a context menu on each revision (commit) with `Open Commit in Remote`, `Copy Commit ID to Clipboard`, `Copy Commit Message to Clipboard`, `Open Files`, `Open Revisions`, and `Show Commit Details` commands
130+
- Provides a context menu on each branch with an `Open Branch in Remote` command
131+
132+
- `Remotes` node — provides a list of the remote branches
133+
- See `Branches` node above for details
134+
135+
- `Stashes` node — provides a list of stashed changes
136+
- Expand each stash to quickly see the set of files stashed, complete with status indicators for adds, changes, renames, and deletes
137+
- Provides a context menu on each stash with `Apply Stashed Changes` (confirmation required), `Delete Stashed Changes` (confirmation required), `Copy Commit Message to Clipboard`, `Open Files`, and `Open Revisions` commands
138+
- Provides a context menu on each stashed file with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, and `Show File History` commands
139+
140+
- `History View` - provides the revision history of the active file
141+
142+
![GitLens History view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-git-custom-view-history.png)
143+
144+
- Automatically updates to track the active editor
145+
- Provides a context menu on each revision (commit) with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, `Open Revision in Remote`, and `Show Commit File Details` commands
146+
147+
- Quickly switch between views using the `Switch to Repository View` or `Switch to History View` commands
148+
- Provides toolbar buttons to `Search Commits`, `Switch to Repository View` or `Switch to History View`, and `Refresh`
129149

130150
- Adds a `Search Commits` command (`gitlens.showCommitSearch`) with a shortcut of `alt+/` to search for commits by message, author, file(s), or commit id
131151

@@ -295,18 +315,15 @@ GitLens is highly customizable and provides many configuration settings to allow
295315
|`gitlens.codeLens.customLocationSymbols`|Specifies the set of document symbols where Git code lens will be shown in the document
296316
|`gitlens.codeLens.perLanguageLocations`|Specifies where Git code lens will be shown in the document for the specified languages
297317

298-
### Git File History Explorer Settings
299-
300-
|Name | Description
301-
|-----|------------
302-
|`gitlens.fileHistoryExplorer.commitFormat`|Specifies the format of committed changes in the `Git File History` explorer <br />Available tokens<br /> ${id} - commit id<br /> ${author} - commit author<br /> ${message} - commit message<br /> ${ago} - relative commit date (e.g. 1 day ago)<br /> ${date} - formatted commit date (format specified by `gitlens.statusBar.dateFormat`)<br /> ${authorAgo} - commit author, relative commit date<br />See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting
303-
304-
### Git Stashes Explorer Settings
318+
### GitLens Custom View Settings
305319

306320
|Name | Description
307321
|-----|------------
308-
|`gitlens.stashExplorer.stashFormat`|Specifies the format of stashed changes in the `Git Stashes` explorer <br />Available tokens<br /> ${id} - commit id<br /> ${author} - commit author<br /> ${message} - commit message<br /> ${ago} - relative commit date (e.g. 1 day ago)<br /> ${date} - formatted commit date (format specified by `gitlens.statusBar.dateFormat`)<br /> ${authorAgo} - commit author, relative commit date<br />See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting
309-
|`gitlens.stashExplorer.stashFileFormat`|Specifies the format of a stashed file in the `Git Stashes` explorer <br />Available tokens<br /> ${file} - file name<br /> ${filePath} - file name and path<br /> ${path} - file path
322+
|`gitlens.gitExplorer.view`|Specifies the starting view (mode) of the `GitLens` custom view<br />`history` - shows the commit history of the active file<br />`repository` - shows a repository explorer"
323+
|`gitlens.gitExplorer.commitFormat`|Specifies the format of committed changes in the `GitLens` custom view<br />Available tokens<br /> ${id} - commit id<br /> ${author} - commit author<br /> ${message} - commit message<br /> ${ago} - relative commit date (e.g. 1 day ago)<br /> ${date} - formatted commit date (format specified by `gitlens.statusBar.dateFormat`)<br /> ${authorAgo} - commit author, relative commit date<br />See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting
324+
|`gitlens.gitExplorer.commitFileFormat`|Specifies the format of a committed file in the `GitLens` custom view<br />Available tokens<br /> ${file} - file name<br /> ${filePath} - file name and path<br /> ${path} - file path
325+
|`gitlens.gitExplorer.stashFormat`|Specifies the format of stashed changes in the `GitLens` custom view<br />Available tokens<br /> ${id} - commit id<br /> ${author} - commit author<br /> ${message} - commit message<br /> ${ago} - relative commit date (e.g. 1 day ago)<br /> ${date} - formatted commit date (format specified by `gitlens.statusBar.dateFormat`)<br /> ${authorAgo} - commit author, relative commit date<br />See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting
326+
|`gitlens.gitExplorer.stashFileFormat`|Specifies the format of a stashed file in the `GitLens` custom view<br />Available tokens<br /> ${file} - file name<br /> ${filePath} - file name and path<br /> ${path} - file path
310327

311328
### Status Bar Settings
312329

0 commit comments

Comments
 (0)