From 2de6cb2c301a4b92c8c40f1bab4606cb00d6eb68 Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Sun, 28 Oct 2018 01:27:01 -0400
Subject: [PATCH] Adds apply stash changes to stashes node
---
images/dark/icon-stash-pop.svg | 6 +++---
images/dark/icon-stash-save.svg | 6 +++---
images/light/icon-stash-pop.svg | 6 +++---
images/light/icon-stash-save.svg | 6 +++---
package.json | 7 ++++++-
5 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/images/dark/icon-stash-pop.svg b/images/dark/icon-stash-pop.svg
index e014d0a..ed97c16 100644
--- a/images/dark/icon-stash-pop.svg
+++ b/images/dark/icon-stash-pop.svg
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 22">
- <path fill="#C5C5C5" d="m11.364995,7.38941l-6.73,0l3.36459,-5.82741l3.36542,5.82741l-0.00001,0z"/>
- <path fill="#C5C5C5" d="m8.974,4.945l0,7.79l-1.948,0l0,-7.79l1.948,0z"/>
- <path fill="#C5C5C5" d="M 10.5 5.258 L 5.5 5.258 L 10.5 5.258 Z M 6.046 4.313 L 9.954 4.313 L 6.046 4.313 Z M 13.608 5.134 C 13.532 4.676 13.13 4.313 12.653 4.313 L 9.954 4.313 L 10.5 5.258 L 12.777 5.258 L 13.732 11.946 L 12.414 11.946 C 12.041 11.946 11.716 12.156 11.544 12.471 L 11.554 12.481 L 11.134 13.331 C 10.971 13.656 10.637 13.866 10.264 13.866 L 5.717 13.866 C 5.354 13.866 5.029 13.656 4.866 13.341 L 4.446 12.471 C 4.284 12.156 3.949 11.946 3.596 11.946 L 2.268 11.946 L 3.223 5.258 L 5.5 5.258 L 6.046 4.313 L 3.347 4.313 C 2.87 4.313 2.468 4.676 2.392 5.134 L 1.312 11.955 L 1.312 16.732 C 1.312 17.258 1.742 17.688 2.268 17.688 L 13.732 17.688 C 14.258 17.688 14.688 17.258 14.688 16.732 L 14.688 11.955 L 13.608 5.134 Z"/>
+ <path fill="#C5C5C5" d="M11.365 7.389h-6.73L8 1.562l3.365 5.827z"/>
+ <path fill="#C5C5C5" d="M8.974 5.945v7.79H7.026v-7.79h1.948z"/>
+ <path fill="#C5C5C5" d="M13.608 6.134a.983.983 0 0 0-.955-.821L11.5 5.3l.5 1 .777-.042.955 6.688h-1.318a.991.991 0 0 0-.87.525l.01.01-.42.85a.971.971 0 0 1-.87.535H5.717a.963.963 0 0 1-.851-.525l-.42-.87a.972.972 0 0 0-.85-.525H2.268l.955-6.688L4 6.3l.5-1-1.153.013a.983.983 0 0 0-.955.821l-1.08 6.821v4.777c0 .526.43.956.956.956h11.464c.526 0 .956-.43.956-.956v-4.777l-1.08-6.821z"/>
</svg>
diff --git a/images/dark/icon-stash-save.svg b/images/dark/icon-stash-save.svg
index 8fa5f1b..b5a5e7a 100644
--- a/images/dark/icon-stash-save.svg
+++ b/images/dark/icon-stash-save.svg
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 22">
- <path fill="#C5C5C5" d="m4.635005,6.8745l6.73,0l-3.36459,5.82741l-3.36542,-5.82741l0.00001,0z"/>
- <path fill="#C5C5C5" d="m8.974,1.5075l0,7.79l-1.948,0l0,-7.79l1.948,0z"/>
- <path fill="#C5C5C5" d="m6.5,4.313l3,0l-3,0zm3,0.945l-3,0l3,0zm4.108,-0.124c-0.076,-0.458 -0.478,-0.821 -0.955,-0.821l-3.153,0l0,0.945l3.277,0l0.955,6.688l-1.318,0c-0.373,0 -0.698,0.21 -0.87,0.525l0.01,0.01l-0.42,0.85c-0.163,0.325 -0.497,0.535 -0.87,0.535l-4.547,0c-0.363,0 -0.688,-0.21 -0.851,-0.525l-0.42,-0.87c-0.162,-0.315 -0.497,-0.525 -0.85,-0.525l-1.328,0l0.955,-6.688l3.277,0l0,-0.945l-3.153,0c-0.477,0 -0.879,0.363 -0.955,0.821l-1.08,6.821l0,4.777c0,0.526 0.43,0.956 0.956,0.956l11.464,0c0.526,0 0.956,-0.43 0.956,-0.956l0,-4.777l-1.08,-6.821z"/>
+ <path fill="#C5C5C5" d="M4.635 7.875h6.73L8 13.701 4.635 7.875z"/>
+ <path fill="#C5C5C5" d="M8.974 1.508v7.79H7.026v-7.79h1.948z"/>
+ <path fill="#C5C5C5" d="M6.006 5.313h3.988-3.988zm3.988.945l-4.011.047 4.011-.047zm3.614-.124a.983.983 0 0 0-.955-.821L10 5.3v1l2.777-.042.955 6.688h-1.318a.991.991 0 0 0-.87.525l.01.01-.42.85a.97.97 0 0 1-.87.535H5.717a.962.962 0 0 1-.851-.525l-.42-.87a.974.974 0 0 0-.85-.525H2.268l.955-6.688L6 6.3v-1l-2.653.013a.983.983 0 0 0-.955.821l-1.08 6.821v4.777c0 .526.43.956.956.956h11.464c.526 0 .956-.43.956-.956v-4.777l-1.08-6.821z"/>
</svg>
diff --git a/images/light/icon-stash-pop.svg b/images/light/icon-stash-pop.svg
index bd531e0..9a8c71f 100644
--- a/images/light/icon-stash-pop.svg
+++ b/images/light/icon-stash-pop.svg
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 22">
- <path fill="#424242" d="m11.364995,7.38941l-6.73,0l3.36459,-5.82741l3.36542,5.82741l-0.00001,0z"/>
- <path fill="#424242" d="m8.974,4.945l0,7.79l-1.948,0l0,-7.79l1.948,0z"/>
- <path fill="#424242" d="M 10.5 5.258 L 5.5 5.258 L 10.5 5.258 Z M 6.046 4.313 L 9.954 4.313 L 6.046 4.313 Z M 13.608 5.134 C 13.532 4.676 13.13 4.313 12.653 4.313 L 9.954 4.313 L 10.5 5.258 L 12.777 5.258 L 13.732 11.946 L 12.414 11.946 C 12.041 11.946 11.716 12.156 11.544 12.471 L 11.554 12.481 L 11.134 13.331 C 10.971 13.656 10.637 13.866 10.264 13.866 L 5.717 13.866 C 5.354 13.866 5.029 13.656 4.866 13.341 L 4.446 12.471 C 4.284 12.156 3.949 11.946 3.596 11.946 L 2.268 11.946 L 3.223 5.258 L 5.5 5.258 L 6.046 4.313 L 3.347 4.313 C 2.87 4.313 2.468 4.676 2.392 5.134 L 1.312 11.955 L 1.312 16.732 C 1.312 17.258 1.742 17.688 2.268 17.688 L 13.732 17.688 C 14.258 17.688 14.688 17.258 14.688 16.732 L 14.688 11.955 L 13.608 5.134 Z"/>
+ <path fill="#424242" d="M11.365 7.389h-6.73L8 1.562l3.365 5.827z"/>
+ <path fill="#424242" d="M8.974 5.945v7.79H7.026v-7.79h1.948z"/>
+ <path fill="#424242" d="M13.608 6.134a.983.983 0 0 0-.955-.821L11.5 5.3l.5 1 .777-.042.955 6.688h-1.318a.991.991 0 0 0-.87.525l.01.01-.42.85a.971.971 0 0 1-.87.535H5.717a.963.963 0 0 1-.851-.525l-.42-.87a.972.972 0 0 0-.85-.525H2.268l.955-6.688L4 6.3l.5-1-1.153.013a.983.983 0 0 0-.955.821l-1.08 6.821v4.777c0 .526.43.956.956.956h11.464c.526 0 .956-.43.956-.956v-4.777l-1.08-6.821z"/>
</svg>
diff --git a/images/light/icon-stash-save.svg b/images/light/icon-stash-save.svg
index c741f46..406d3eb 100644
--- a/images/light/icon-stash-save.svg
+++ b/images/light/icon-stash-save.svg
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 22">
- <path fill="#424242" d="m4.635005,6.8745l6.73,0l-3.36459,5.82741l-3.36542,-5.82741l0.00001,0z"/>
- <path fill="#424242" d="m8.974,1.5075l0,7.79l-1.948,0l0,-7.79l1.948,0z"/>
- <path fill="#424242" d="m6.5,4.313l3,0l-3,0zm3,0.945l-3,0l3,0zm4.108,-0.124c-0.076,-0.458 -0.478,-0.821 -0.955,-0.821l-3.153,0l0,0.945l3.277,0l0.955,6.688l-1.318,0c-0.373,0 -0.698,0.21 -0.87,0.525l0.01,0.01l-0.42,0.85c-0.163,0.325 -0.497,0.535 -0.87,0.535l-4.547,0c-0.363,0 -0.688,-0.21 -0.851,-0.525l-0.42,-0.87c-0.162,-0.315 -0.497,-0.525 -0.85,-0.525l-1.328,0l0.955,-6.688l3.277,0l0,-0.945l-3.153,0c-0.477,0 -0.879,0.363 -0.955,0.821l-1.08,6.821l0,4.777c0,0.526 0.43,0.956 0.956,0.956l11.464,0c0.526,0 0.956,-0.43 0.956,-0.956l0,-4.777l-1.08,-6.821z"/>
+ <path fill="#424242" d="M4.635 7.875h6.73L8 13.701 4.635 7.875z"/>
+ <path fill="#424242" d="M8.974 1.508v7.79H7.026v-7.79h1.948z"/>
+ <path fill="#424242" d="M6.006 5.313h3.988-3.988zm3.988.945l-4.011.047 4.011-.047zm3.614-.124a.983.983 0 0 0-.955-.821L10 5.3v1l2.777-.042.955 6.688h-1.318a.991.991 0 0 0-.87.525l.01.01-.42.85a.97.97 0 0 1-.87.535H5.717a.962.962 0 0 1-.851-.525l-.42-.87a.974.974 0 0 0-.85-.525H2.268l.955-6.688L6 6.3v-1l-2.653.013a.983.983 0 0 0-.955.821l-1.08 6.821v4.777c0 .526.43.956.956.956h11.464c.526 0 .956-.43.956-.956v-4.777l-1.08-6.821z"/>
</svg>
diff --git a/package.json b/package.json
index 1227fce..5b9c873 100644
--- a/package.json
+++ b/package.json
@@ -3598,9 +3598,14 @@
"group": "7_gitlens@1"
},
{
+ "command": "gitlens.stashApply",
+ "when": "viewItem == gitlens:stashes",
+ "group": "inline@1"
+ },
+ {
"command": "gitlens.stashSave",
"when": "viewItem =~ /^gitlens:(stashes|status:files)$/",
- "group": "inline@1"
+ "group": "inline@2"
},
{
"command": "gitlens.stashSave",