From 529549129fbe591718b83087d0d58c0ed7f4cd3d Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sat, 2 Sep 2017 01:46:29 -0400 Subject: [PATCH] Preps v5.0.0-alpha Updates dependencies --- CHANGELOG.md | 68 +++++++++++++++++++++++++++++++++++++++-------- README.md | 67 +++++++++++++++++++++++++++++----------------- package-lock.json | 61 +++++++++++++++++++++--------------------- package.json | 8 +++--- 4 files changed, 133 insertions(+), 71 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7740ff7f5b0f2..98bf7e27c04c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,17 +4,63 @@ 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/). -## [4.5.0-beta] - 2017-08-27 +## [5.0.0-alpha] - 2017-09-02 ### Added -- Adds an all-new `Git File History` explorer to the Explorer activity -- enabled via `"gitlens.insiders": true` - - Shows the commit history of the active file -- automatically tracks the active editor - - Provides toolbar buttons to `Refresh` - - 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 -- Adds a `No stashed changes` message to the `Git Stashes` explorer when there are no stashes +- Adds an all-new `GitLens` custom view to the Explorer activity + + - `Repository View` - provides a full repository explorer + + ![GitLens Repository view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-git-custom-view-repository.png) + + - `Status` node — provides the status of current branch + - Indicates whether or not the current branch is up-to-date with its upstream branch + - If the branch is out of sync, additional nodes will be shown with the specific commits ahead and/or behind the upstream + + - `Branches` node — provides a list of the local branches + - Indicates which branch is the current branch + - Expand each branch to easily see its revision (commit) history + - Expand each revision (commit) to quickly see the set of files changed, complete with status indicators for adds, changes, renames, and deletes + - 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 + - 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 + - Provides a context menu on each branch with an `Open Branch in Remote` command + + - `Remotes` node — provides a list of the remote branches + - See `Branches` node above for details + + - `Stashes` node — provides a list of stashed changes + - Expand each stash to quickly see the set of files stashed, complete with status indicators for adds, changes, renames, and deletes + - 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 + - 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 + + - `History View` - provides the revision history of the active file + + ![GitLens History view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-git-custom-view-history.png) + + - Automatically updates to track the active editor + - 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 + + - Quickly switch between views using the `Switch to Repository View` or `Switch to History View` commands + - Provides toolbar buttons to `Search Commits`, `Switch to Repository View` or `Switch to History View`, and `Refresh` + - Adds `${filePath}` token to file formatting ### Changed -- Changes `gitlens.stashExplorer.stashFileFormat` setting to defaults to `${filePath}` for better separator handling +- Renames `Compare File with Previous` command (gitlens.diffWithPrevious) to `Compare File with Previous Revision` +- Renames `Compare File with Next Commit` command (`gitlens.diffWithNext`) to `Compare File with Next Revision` +- Renames `Compare File with Working Tree` command (`gitlens.diffWithWorking`) to `Compare File with Working Revision` +- Renames `Compare Line Commit with Previous` command (`gitlens.diffLineWithPrevious`) to `Compare Line Revision with Previous` +- Renames `Compare Line Commit with Working Tree` command (`gitlens.diffLineWithWorking`) to `Compare Line Revision with Working` + +- Renames `gitlens.stashExplorer.stashFormat` setting to `gitlens.gitExplorer.stashFormat` +- Renames `gitlens.stashExplorer.stashFileFormat` setting to `gitlens.gitExplorer.stashFileFormat` +- Changes `gitlens.gitExplorer.stashFileFormat` setting to defaults to `${filePath}` for better separator handling + +## Removed +- Removes the `Git Stashes` custom view view - as it's functionality has been folded into the new `GitLens` custom view +- Removes the seeding of the commit search command from the clipboard + +## Fixed +- Fixes an issue where remote branches couldn't be opened properly in their remote service ## [4.4.3] - 2017-08-30 ## Fixed @@ -63,18 +109,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ## [4.3.1] - 2017-07-03 ## Added -- Adds `gitlens.stashExplorer.enabled` setting to specify whether or not to show the `Git Stashes` explorer -- Adds `Toggle Git Stashes Explorer` command (`gitlens.stashExplorer.toggle`) - toggles the `Git Stashes` explorer on and off +- Adds `gitlens.stashExplorer.enabled` setting to specify whether or not to show the `Git Stashes` custom view +- Adds `Toggle Git Stashes Explorer` command (`gitlens.stashExplorer.toggle`) - toggles the `Git Stashes` custom view on and off ## Changed -- Hides the `Git Stashes` explorer by default +- Hides the `Git Stashes` custom view by default ## Fixed - Fixes [#108](https://github.com/eamodio/vscode-gitlens/issues/108) - Option to remove stash explorer from the main explorer? ## [4.3.0] - 2017-07-03 ## Added -- Adds `Git Stashes` view to the Explorer activity +- Adds `Git Stashes` custom view to the Explorer activity ![Git Stashes view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-git-stashes.png) diff --git a/README.md b/README.md index 6b3cb5ca2096c..c7fb5df145a2c 100644 --- a/README.md +++ b/README.md @@ -97,35 +97,55 @@ GitLens provides an unobtrusive blame annotation at the end of the current line, - Adds a `Compare File with Branch...` command (`gitlens.diffWithBranch`) to compare the active file with the same file on the selected branch -- 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 +- 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 -- 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 +- 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 -- 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 +- 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 - Adds a `Compare File with Revision...` command (`gitlens.diffWithRevision`) to compare the active file with the selected revision of the same file -- 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 +- 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 -- 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 +- 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 ### Navigate and Explore -- Adds a [customizable](#git-file-history-explorer-settings) `Git File History` explorer to the Explorer activity -- currently [insiders](#insiders) only +- Adds a [customizable](#gitlens-custom-view-settings) `GitLens` custom view to the Explorer activity - - Shows the commit history of the active file -- automatically tracks the active editor - - Provides toolbar buttons to `Refresh` - - 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 + - `Repository View` - provides a full repository explorer -- Adds a [customizable](#git-stashes-explorer-settings) `Git Stashes` explorer to the Explorer activity + ![GitLens Repository view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-git-custom-view-repository.png) - ![Git Stashes explorer](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-git-stashes.png) + - `Status` node — provides the status of current branch + - Indicates whether or not the current branch is up-to-date with its upstream branch + - If the branch is out of sync, additional nodes will be shown with the specific commits ahead and/or behind the upstream - - Shows all of the stashed changes in the repository - - Provides toolbar buttons to `Stash Changes` and `Refresh` - - Provides a context menu with `Apply Stashed Changes` and `Delete Stashed Changes` commands — both require a confirmation - - Expand each stash to quickly see the set of files changed, complete with status indicators for adds, changes, renames, and deletes - - Provides a context menu with `Open Changes`, `Open File`, `Open Stashed File`, `Open File in Remote`, and `Compare File with Working Tree` commands + - `Branches` node — provides a list of the local branches + - Indicates which branch is the current branch + - Expand each branch to easily see its revision (commit) history + - Expand each revision (commit) to quickly see the set of files changed, complete with status indicators for adds, changes, renames, and deletes + - 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 + - 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 + - Provides a context menu on each branch with an `Open Branch in Remote` command + + - `Remotes` node — provides a list of the remote branches + - See `Branches` node above for details + + - `Stashes` node — provides a list of stashed changes + - Expand each stash to quickly see the set of files stashed, complete with status indicators for adds, changes, renames, and deletes + - 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 + - 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 + + - `History View` - provides the revision history of the active file + + ![GitLens History view](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/screenshot-git-custom-view-history.png) + + - Automatically updates to track the active editor + - 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 + + - Quickly switch between views using the `Switch to Repository View` or `Switch to History View` commands + - Provides toolbar buttons to `Search Commits`, `Switch to Repository View` or `Switch to History View`, and `Refresh` - Adds a `Search Commits` command (`gitlens.showCommitSearch`) with a shortcut of `alt+/` to search for commits by message, author, file(s), or commit id @@ -295,18 +315,15 @@ GitLens is highly customizable and provides many configuration settings to allow |`gitlens.codeLens.customLocationSymbols`|Specifies the set of document symbols where Git code lens will be shown in the document |`gitlens.codeLens.perLanguageLocations`|Specifies where Git code lens will be shown in the document for the specified languages -### Git File History Explorer Settings - -|Name | Description -|-----|------------ -|`gitlens.fileHistoryExplorer.commitFormat`|Specifies the format of committed changes in the `Git File History` explorer
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`)
${authorAgo} - commit author, relative commit date
See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting - -### Git Stashes Explorer Settings +### GitLens Custom View Settings |Name | Description |-----|------------ -|`gitlens.stashExplorer.stashFormat`|Specifies the format of stashed changes in the `Git Stashes` explorer
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`)
${authorAgo} - commit author, relative commit date
See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting -|`gitlens.stashExplorer.stashFileFormat`|Specifies the format of a stashed file in the `Git Stashes` explorer
Available tokens
${file} - file name
${filePath} - file name and path
${path} - file path +|`gitlens.gitExplorer.view`|Specifies the starting view (mode) of the `GitLens` custom view
`history` - shows the commit history of the active file
`repository` - shows a repository explorer" +|`gitlens.gitExplorer.commitFormat`|Specifies the format of committed changes in the `GitLens` custom view
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`)
${authorAgo} - commit author, relative commit date
See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting +|`gitlens.gitExplorer.commitFileFormat`|Specifies the format of a committed file in the `GitLens` custom view
Available tokens
${file} - file name
${filePath} - file name and path
${path} - file path +|`gitlens.gitExplorer.stashFormat`|Specifies the format of stashed changes in the `GitLens` custom view
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`)
${authorAgo} - commit author, relative commit date
See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting +|`gitlens.gitExplorer.stashFileFormat`|Specifies the format of a stashed file in the `GitLens` custom view
Available tokens
${file} - file name
${filePath} - file name and path
${path} - file path ### Status Bar Settings diff --git a/package-lock.json b/package-lock.json index c60b109cb624e..3e95490a4d434 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "gitlens", - "version": "4.4.3", + "version": "5.0.0-alpha", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -16,7 +16,7 @@ "integrity": "sha1-qjuL2ivlErGuCgV7lC6GnDcKVWk=", "dev": true, "requires": { - "@types/node": "8.0.25" + "@types/node": "8.0.26" } }, "@types/mocha": { @@ -26,9 +26,9 @@ "dev": true }, "@types/node": { - "version": "8.0.25", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.25.tgz", - "integrity": "sha512-zT+t9841g1HsjLtPMCYxmb1U4pcZ2TOegAKiomlmj6bIziuaEYHUavxLE9NRwdntY0vOCrgHho6OXjDX7fm/Kw==", + "version": "8.0.26", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.26.tgz", + "integrity": "sha512-wbKN0MB4XsjdnSE04HiCzLoBDirGCM6zXrqavSj44nZnPFYpnrTF64E9O6Xmf0ca/IuKK/BHUcXwMiwk92gW6Q==", "dev": true }, "@types/tmp": { @@ -660,7 +660,7 @@ "requires": { "asynckit": "0.4.0", "combined-stream": "1.0.5", - "mime-types": "2.1.16" + "mime-types": "2.1.17" } }, "from": { @@ -999,7 +999,7 @@ "is-typedarray": "1.0.0", "isstream": "0.1.2", "json-stringify-safe": "5.0.1", - "mime-types": "2.1.16", + "mime-types": "2.1.17", "oauth-sign": "0.8.2", "qs": "6.3.2", "stringstream": "0.0.5", @@ -1271,9 +1271,9 @@ "integrity": "sha512-sr1ZQph3UwHTR0XftSbK85OvBbxe/abLGzEnPENCQwmHf7sck8Oyu4ob3LgBxWWxRoM+QszeUyl7jbqapu2TqA==" }, "ignore": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.4.tgz", - "integrity": "sha512-KjHyHxUgicfgFiTJaIA9DoeY3TIQz5thaKqm35re7RTVVB7zjF1fTMIDMXM4GUUBipR4FW8BvGnA115pZ/AxQQ==" + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz", + "integrity": "sha512-JLH93mL8amZQhh/p6mfQgVBH3M6epNq3DfsXsTSuSrInVjwyYlFE1nv2AgfRCC8PoOhM0jwQ5v8s9LgbK7yGDw==" }, "inflight": { "version": "1.0.6", @@ -1728,7 +1728,7 @@ "normalize-path": "2.1.1", "object.omit": "2.0.1", "parse-glob": "3.0.4", - "regex-cache": "0.4.3" + "regex-cache": "0.4.4" }, "dependencies": { "is-extglob": { @@ -1749,18 +1749,18 @@ } }, "mime-db": { - "version": "1.29.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz", - "integrity": "sha1-SNJtI1WJZRcErFkWygYAGRQmaHg=", + "version": "1.30.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz", + "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=", "dev": true }, "mime-types": { - "version": "2.1.16", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz", - "integrity": "sha1-K4WKUuXs1RbbiXrCvodIeDBpjiM=", + "version": "2.1.17", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", + "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", "dev": true, "requires": { - "mime-db": "1.29.0" + "mime-db": "1.30.0" } }, "minimatch": { @@ -2080,13 +2080,12 @@ } }, "regex-cache": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz", - "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=", + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", + "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", "dev": true, "requires": { - "is-equal-shallow": "0.1.3", - "is-primitive": "2.0.0" + "is-equal-shallow": "0.1.3" } }, "remove-trailing-separator": { @@ -2132,7 +2131,7 @@ "is-typedarray": "1.0.0", "isstream": "0.1.2", "json-stringify-safe": "5.0.1", - "mime-types": "2.1.16", + "mime-types": "2.1.17", "oauth-sign": "0.8.2", "performance-now": "0.2.0", "qs": "6.4.0", @@ -2489,13 +2488,13 @@ "resolve": "1.4.0", "semver": "5.4.1", "tslib": "1.7.1", - "tsutils": "2.8.1" + "tsutils": "2.8.2" } }, "tsutils": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.8.1.tgz", - "integrity": "sha1-N3FATnyp8L7fXZGaR6SxiQpo7/8=", + "version": "2.8.2", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.8.2.tgz", + "integrity": "sha1-LBSGukMSYIRbCsb5Aq/Z1wio6mo=", "dev": true, "requires": { "tslib": "1.7.1" @@ -2515,9 +2514,9 @@ "optional": true }, "typescript": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz", - "integrity": "sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ=", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.2.tgz", + "integrity": "sha1-A4qV99m7tCCxvzW6MdTFwd0//jQ=", "dev": true }, "unique-stream": { diff --git a/package.json b/package.json index 949ed567725f7..03e16826962e7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gitlens", - "version": "4.5.0-beta", + "version": "5.0.0-alpha", "author": { "name": "Eric Amodio", "email": "eamodio@gmail.com" @@ -1705,7 +1705,7 @@ "applicationinsights": "0.21.0", "copy-paste": "1.3.0", "iconv-lite": "0.4.18", - "ignore": "3.3.4", + "ignore": "3.3.5", "lodash.debounce": "4.0.8", "lodash.escaperegexp": "4.1.2", "lodash.isequal": "4.5.0", @@ -1719,11 +1719,11 @@ "@types/copy-paste": "1.1.30", "@types/iconv-lite": "0.0.1", "@types/mocha": "2.2.42", - "@types/node": "8.0.25", + "@types/node": "8.0.26", "@types/tmp": "0.0.33", "mocha": "3.5.0", "tslint": "5.7.0", - "typescript": "2.4.2", + "typescript": "2.5.2", "vscode": "1.1.5" } }