@ -4,6 +4,10 @@ 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/).
## [Unreleased]
### Added
- 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 — closes [#312](https://github.com/eamodio/vscode-gitlens/issues/312)
## [8.1.1] - 2018-03-12
### Fixed
- Fixes [#276](https://github.com/eamodio/vscode-gitlens/issues/276) - Lookup for branches without upstreams fails
@ -562,9 +562,9 @@ See also [Explorer Settings](#explorer-settings "Jump to the Explorer settings")
|-----|------------
|`gitlens.explorers.avatars`|Specifies whether to show avatar images instead of commit (or status) icons in the *GitLens* and *GitLens Results* views
|`gitlens.explorers.commitFileFormat`|Specifies the format of a committed file in the *GitLens* and *GitLens Results* views<br/>Available tokens<br/> ${directory} - directory name<br/> ${file} - file name<br/> ${filePath} - formatted file name and path<br/> ${path} - full file path
|`gitlens.explorers.commitFormat`|Specifies the format of committed changes in the *GitLens* and *GitLens Results* views<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
|`gitlens.explorers.commitFormat`|Specifies the format of committed changes in the *GitLens* and *GitLens Results* views<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/> ${agoOrDate} - commit date specified by `gitlens.defaultDateStyle`<br/> ${authorAgo} - commit author, relative commit date<br/> ${authorAgoOrDate} - commit author, commit date specified by `gitlens.defaultDateStyle`<br/>See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting
|`gitlens.explorers.stashFileFormat`|Specifies the format of a stashed file in the *GitLens* and *GitLens Results* views<br/>Available tokens<br/> ${directory} - directory name<br/> ${file} - file name<br/> ${filePath} - formatted file name and path<br/> ${path} - full file path
|`gitlens.explorers.stashFormat`|Specifies the format of stashed changes in the *GitLens* and *GitLens Results* views<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
|`gitlens.explorers.stashFormat`|Specifies the format of stashed changes in the *GitLens* and *GitLens Results* views<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/> ${agoOrDate} - commit date specified by `gitlens.defaultDateStyle`<br/> ${authorAgo} - commit author, relative commit date<br/> ${authorAgoOrDate} - commit author, commit date specified by `gitlens.defaultDateStyle`<br/>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* views<br/>Available tokens<br/> ${directory} - directory name<br/> ${file} - file name<br/> ${filePath} - formatted file name and path<br/> ${path} - full file path<br/>${working} - optional indicator if the file is uncommitted
### Code Lens Settings
@ -586,7 +586,7 @@ See also [Explorer Settings](#explorer-settings "Jump to the Explorer settings")
|-----|------------
|`gitlens.currentLine.dateFormat`|Specifies how to format absolute dates (using the `${date}` token) for the current line blame annotations<br/>See https://momentjs.com/docs/#/displaying/format/ for valid formats
|`gitlens.currentLine.enabled`|Specifies whether to provide a blame annotation for the current line, by default<br/>Use the *Toggle Line Blame Annotations* command (`gitlens.toggleLineBlame`) to toggle the annotations on and off for the current window
|`gitlens.currentLine.format`|Specifies the format of the current line blame annotation<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.annotations.line.trailing.dateFormat`)<br/>`${authorAgo}` - commit author, relative commit date<br/>See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting
|`gitlens.currentLine.format`|Specifies the format of the current line blame annotation<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.currentLine.dateFormat`)<br/>`${agoOrDate}` - commit date specified by `gitlens.defaultDateStyle`<br/>`${authorAgo}` - commit author, relative commit date<br/>`${authorAgoOrDate}` - commit author, commit date specified by `gitlens.defaultDateStyle`<br/>See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting
### Gutter Blame Settings
@ -595,7 +595,7 @@ See also [Explorer Settings](#explorer-settings "Jump to the Explorer settings")
|`gitlens.blame.avatars`|Specifies whether to show avatar images in the gutter blame annotations
|`gitlens.blame.compact`|Specifies whether to compact (deduplicate) matching adjacent gutter blame annotations
|`gitlens.blame.dateFormat`|Specifies how to format absolute dates (using the `${date}` token) in gutter blame annotations<br/>See https://momentjs.com/docs/#/displaying/format/ for valid formats
|`gitlens.blame.format`|Specifies the format of the gutter blame annotations<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.blame.dateFormat`)<br/>`${authorAgo}` - commit author, relative commit date<br/>See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting
|`gitlens.blame.format`|Specifies the format of the gutter blame annotations<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.blame.dateFormat`)<br/>`${agoOrDate}` - commit date specified by `gitlens.defaultDateStyle`<br/>`${authorAgo}` - commit author, relative commit date<br/>`${authorAgoOrDate}` - commit author, commit date specified by `gitlens.defaultDateStyle`<br/>See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting
|`gitlens.blame.heatmap.enabled`|Specifies whether to provide a heatmap indicator in the gutter blame annotations
|`gitlens.blame.heatmap.location`|Specifies where the heatmap indicators will be shown in the gutter blame annotations<br/>`left` - adds a heatmap indicator on the left edge of the gutter blame annotations<br/>`right` - adds a heatmap indicator on the right edge of the gutter blame annotations
|`gitlens.blame.highlight.enabled`|Specifies whether to highlight lines associated with the current line
@ -639,7 +639,7 @@ See also [Explorer Settings](#explorer-settings "Jump to the Explorer settings")
|`gitlens.statusBar.command`|Specifies the command to be executed when the blame status bar item is clicked<br/>`gitlens.toggleFileBlame` - toggles file blame annotations<br/>`gitlens.diffWithPrevious` - compares the current line commit with the previous<br/>`gitlens.diffWithWorking` - compares the current line commit with the working tree<br/>`gitlens.toggleCodeLens` - toggles Git code lens<br/>`gitlens.showQuickCommitDetails` - shows a commit details quick pick<br/>`gitlens.showQuickCommitFileDetails` - shows a commit file details quick pick<br/>`gitlens.showQuickFileHistory` - shows a file history quick pick<br/>`gitlens.showQuickRepoHistory` - shows a branch history quick pick
|`gitlens.statusBar.dateFormat`|Specifies the date format of absolute dates shown in the blame information on the status bar<br/>See https://momentjs.com/docs/#/displaying/format/ for valid formats
|`gitlens.statusBar.enabled`|Specifies whether to provide blame information on the status bar
|`gitlens.statusBar.format`|Specifies the format of the blame information on the status bar<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/>See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting
|`gitlens.statusBar.format`|Specifies the format of the blame information on the status bar<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/>`${agoOrDate}` - commit date specified by `gitlens.defaultDateStyle`<br/>`${authorAgo}` - commit author, relative commit date<br/>`${authorAgoOrDate}` - commit author, commit date specified by `gitlens.defaultDateStyle`<br/>See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting
|`gitlens.statusBar.reduceFlicker`|Specifies whether to reduce the status bar "flickering" when changing lines by not first clearing the previous blame information
"description":"Specifies the format of the gutter blame annotations\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.blame.dateFormat`)\n ${authorAgo} - commit author, relative commit date\nSee https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting",
"default":"${message|40?} ${agoOrDate|14-}",
"description":"Specifies the format of the gutter blame annotations\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.blame.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.blame.heatmap.enabled":{
@ -325,8 +325,8 @@
},
"gitlens.currentLine.format":{
"type":"string",
"default":"${authorAgo} \u2022 ${message}",
"description":"Specifies the format of the current line blame annotation\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.annotations.line.trailing.dateFormat`)\n ${authorAgo} - commit author, relative commit date\nSee https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting",
"default":"${authorAgoOrDate} \u2022 ${message}",
"description":"Specifies the format of the current line blame annotation\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.currentLine.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 committed changes in the `GitLens` and `GitLens Results` views\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 ${authorAgo} - commit author, relative commit date\nSee https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting",
"description":"Specifies the format of committed changes in the `GitLens` and `GitLens Results` views\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.stashFileFormat":{
@ -392,7 +392,7 @@
"gitlens.explorers.stashFormat":{
"type":"string",
"default":"${message}",
"description":"Specifies the format of stashed changes in the `GitLens` and `GitLens Results` views\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 ${authorAgo} - commit author, relative commit date\nSee https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting",
"description":"Specifies the format of stashed changes in the `GitLens` and `GitLens Results` views\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":{
@ -763,8 +763,8 @@
},
"gitlens.statusBar.format":{
"type":"string",
"default":"${authorAgo}",
"description":"Specifies the format of the status bar blame information\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 ${authorAgo} - commit author, relative commit date\nSee https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting",
"default":"${authorAgoOrDate}",
"description":"Specifies the format of the status bar blame information\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",
Eric Amodio
7 years ago