diff --git a/images/dark/icon-compare-ref-remote.svg b/images/dark/icon-compare-ref-remote.svg new file mode 100644 index 0000000..502492f --- /dev/null +++ b/images/dark/icon-compare-ref-remote.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/images/dark/icon-compare-ref-working.svg b/images/dark/icon-compare-ref-working.svg new file mode 100644 index 0000000..272ffc6 --- /dev/null +++ b/images/dark/icon-compare-ref-working.svg @@ -0,0 +1,4 @@ + + + + diff --git a/images/dark/icon-compare-refs.svg b/images/dark/icon-compare-refs.svg new file mode 100644 index 0000000..cf2871d --- /dev/null +++ b/images/dark/icon-compare-refs.svg @@ -0,0 +1,4 @@ + + + + diff --git a/images/light/icon-compare-ref-remote.svg b/images/light/icon-compare-ref-remote.svg new file mode 100644 index 0000000..59b1a9d --- /dev/null +++ b/images/light/icon-compare-ref-remote.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/images/light/icon-compare-ref-working.svg b/images/light/icon-compare-ref-working.svg new file mode 100644 index 0000000..2248995 --- /dev/null +++ b/images/light/icon-compare-ref-working.svg @@ -0,0 +1,4 @@ + + + + diff --git a/images/light/icon-compare-refs.svg b/images/light/icon-compare-refs.svg new file mode 100644 index 0000000..0f9bad7 --- /dev/null +++ b/images/light/icon-compare-refs.svg @@ -0,0 +1,4 @@ + + + + diff --git a/package.json b/package.json index c77b09f..c8ddee8 100644 --- a/package.json +++ b/package.json @@ -2048,12 +2048,20 @@ { "command": "gitlens.views.compareWithHead", "title": "Compare with HEAD", - "category": "GitLens" + "category": "GitLens", + "icon": { + "dark": "images/dark/icon-compare-refs.svg", + "light": "images/light/icon-compare-refs.svg" + } }, { "command": "gitlens.views.compareWithRemote", "title": "Compare with Remote", - "category": "GitLens" + "category": "GitLens", + "icon": { + "dark": "images/dark/icon-compare-ref-remote.svg", + "light": "images/light/icon-compare-ref-remote.svg" + } }, { "command": "gitlens.views.compareWithSelected", @@ -2063,7 +2071,11 @@ { "command": "gitlens.views.compareWithWorking", "title": "Compare with Working Tree", - "category": "GitLens" + "category": "GitLens", + "icon": { + "dark": "images/dark/icon-compare-ref-working.svg", + "light": "images/light/icon-compare-ref-working.svg" + } }, { "command": "gitlens.views.selectForCompare", @@ -3243,16 +3255,32 @@ }, { "command": "gitlens.openBranchInRemote", - "when": "viewItem =~ /gitlens:(branch\\b(.*?:tracking|:remote))/", + "when": "viewItem =~ /gitlens:branch\\b(.*?:tracking|:remote)/", "group": "inline@98" }, { "command": "gitlens.openBranchInRemote", - "when": "viewItem =~ /gitlens:(branch\\b(.*?:tracking|:remote))/", + "when": "viewItem =~ /gitlens:branch\\b(.*?:tracking|:remote)/", "group": "1_gitlens@1" }, { "command": "gitlens.views.compareWithRemote", + "when": "viewItem =~ /gitlens:branch\\b.*?:tracking/", + "group": "inline@96" + }, + { + "command": "gitlens.views.compareWithHead", + "when": "viewItem =~ /gitlens:(branch(?!:current)|commit|stash|tag)\\b/", + "group": "inline@97", + "alt": "gitlens.views.compareWithWorking" + }, + { + "command": "gitlens.views.compareWithWorking", + "when": "viewItem =~ /gitlens:branch:current\\b/", + "group": "inline@97" + }, + { + "command": "gitlens.views.compareWithRemote", "when": "viewItem =~ /gitlens:(branch\\b.*?:tracking)/", "group": "7_gitlens@1" }, @@ -3263,7 +3291,7 @@ }, { "command": "gitlens.views.compareWithWorking", - "when": "viewItem =~ /gitlens:(branch(?!:current)|commit|stash|tag)\\b/", + "when": "viewItem =~ /gitlens:(branch|commit|stash|tag)\\b/", "group": "7_gitlens@3" }, {