From c8a64efe409ece3eadd18ac033eaab2c6630be4b Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 12 Dec 2018 00:47:17 -0500 Subject: [PATCH] Adds date and changes to stashes in views --- CHANGELOG.md | 1 + README.md | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02b0146..86d99f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Only provided if the current branch is tracking a remote branch and is ahead of it - Adds control over the contributed menu commands to the Source Control side bar to the GitLens interactive settings editor (via the `gitlens.menus` setting) - Adds Git extended regex support to commit searches +- Adds the date and a changes indicator (+x ~x -x) to stashes in GitLens views (uses the new `${changes}` token in the `gitlens.views.stashFormat` setting) ### Changed diff --git a/README.md b/README.md index 397a025..c648d8a 100644 --- a/README.md +++ b/README.md @@ -350,7 +350,7 @@ The repositories view provides the following features, - **Stashes** — lists the stashed changes in the repository - An inline toolbar provides quick access to the _Apply Stash Changes_, and _Stash Changes_ commands - - Provides the name of each stashed changes + - Provides the name of each stashed changes, the date, and an indicator (+x ~x -x) of the changes - An inline toolbar provides quick access to the _Compare with HEAD_ (`alt-click` for _Compare with Working Tree_), _Apply Stashed Changes_, and _Delete Stashed Changes_ commands - A context menu provides access to more common stashed changes commands - Each stashed changes expands to list the set of stashed files, complete with status indicators for adds, changes, renames, and deletes diff --git a/package.json b/package.json index 14f616d..312129e 100644 --- a/package.json +++ b/package.json @@ -1475,7 +1475,7 @@ }, "gitlens.views.stashFormat": { "type": "string", - "default": "${message}", + "default": "${message} • ${agoOrDate}${ • changes}", "markdownDescription": "Specifies the format of stashed changes in the views. See the [GitLens docs](https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting) for advanced formatting\n- Available 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#`", "scope": "window" },