Skip to content

Commit 60c1fae

Browse files
mhutchiemhutchie
committed
Merge branch 'develop'
2 parents b3267f3 + 5003103 commit 60c1fae

34 files changed

+7992
-1280
lines changed

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Change Log
22

3+
## 1.28.0 - 2020-12-01
4+
* #399 Sign Commits and Tags created by actions in the Git Graph View, by enabling the new extension settings `git-graph.repository.sign.commits` and `git-graph.repository.sign.tags` respectively. This is an alternative to the existing method using Git config (`commit.gpgSign` and `tag.gpgSign`).
5+
* #406 The keybindings for all Git Graph View keyboard shortcuts can now be configured using new extension settings `git-graph.keyboardShortcut.*`.
6+
* #407 Control whether Remote Head Symbolic References (e.g. origin/HEAD) are displayed in Git Graph via the new extension setting `git-graph.repository.showRemoteHeads`. Thanks [Maciej Wilk (@wilkmaciej)](https://github.com/wilkmaciej) for helping with this!
7+
* #409 Include built-in support for new emoji shortcodes recently added to [gitmoji](https://gitmoji.carloscuesta.me/).
8+
* #412 New "Git Graph: Fetch from Remote(s)" command contributed to Visual Studio Code, that opens the Git Graph View and immediately runs "Fetch from Remote(s)".
9+
* #414 Your Git Graph Repository Configuration can now be exported to a file that can be committed in the repository. It allows others working in the same repository to automatically use the same Git Graph configuration. To export your configuration, click the "Export Repository Configuration" button at the bottom of the Repository Settings Widget (on the Git Graph View).
10+
* #416 The existing file encoding extension setting `git-graph.fileEncoding` can now also be configured at a Workspace Folder Scope.
11+
* #419 On dialogs that refer to the "current branch" (Merge, Pull, Rebase, and Reset), the current branch is now explicitly mentioned.
12+
* #420 Fixed an issue that prevented files that overflow horizontally in the Commit Details View Files View from being left-clicked (i.e. those shortened with an ellipsis). _(issue introduced via #381)_
13+
* Significant code improvements.
14+
315
## 1.27.0 - 2020-11-01
416
* #281 For the Repository Settings Widget, read values defined in additional Git config files when they're included via [include directives](https://git-scm.com/docs/git-config#_includes) in local or global Git config files.
517
* #364 Parse and render a frequently used subset of inline Markdown formatting rules in commit messages and tag details (bold, italics, bold & italics, and inline code blocks). Markdown parsing can be disabled using the extension setting `git-graph.markdown`.

‎README.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ View a Git Graph of your repository, and easily perform Git actions from the gra
4848
* Configure "Pull Request Creation" - Automates the opening and pre-filling of a Pull Request form, directly from a branches context menu.
4949
* Support for the publicly hosted Bitbucket, GitHub and GitLab Pull Request providers is built-in.
5050
* Custom Pull Request providers can be configured using the Extension Setting `git-graph.customPullRequestProviders` (e.g. for use with privately hosted Pull Request providers). Information on how to configure custom providers is available [here](https://github.com/mhutchie/vscode-git-graph/wiki/Configuring-a-custom-Pull-Request-Provider).
51+
* Export your Git Graph Repository Configuration to a file that can be committed in the repository. It allows others working in the same repository to automatically use the same Git Graph configuration.
5152
* Keyboard Shortcuts (available in the Git Graph View):
5253
* `CTRL/CMD + F`: Open the Find Widget.
5354
* `CTRL/CMD + H`: Scrolls the Git Graph View to be centered on the commit referenced by HEAD.
@@ -86,14 +87,15 @@ A summary of the Git Graph extension settings are:
8687
* **Format**: Specifies the date format to be used in the "Date" column on the Git Graph View.
8788
* **Type**: Specifies the date type to be displayed in the "Date" column on the Git Graph View, either the author or commit date.
8889
* **Default Column Visibility**: An object specifying the default visibility of the Date, Author & Commit columns. Example: `{"Date": true, "Author": true, "Commit": true}`
89-
* **Dialog.\***: Set the default options on the following dialogs: Add Tag, Apply Stash, Cherry Pick, Create Branch, Delete Branch, Fetch Remote, Merge, Pop Stash, Pull Branch, Rebase, Reset, and Stash Uncommitted Changes
90+
* **Dialog > \***: Set the default options on the following dialogs: Add Tag, Apply Stash, Cherry Pick, Create Branch, Delete Branch, Fetch Remote, Merge, Pop Stash, Pull Branch, Rebase, Reset, and Stash Uncommitted Changes
9091
* **Enhanced Accessibility**: Visual file change A|M|D|R|U indicators in the Commit Details View for users with colour blindness. In the future, this setting will enable any additional accessibility related features of Git Graph that aren't enabled by default.
9192
* **File Encoding**: The character set encoding used when retrieving a specific version of repository files (e.g. in the Diff View). A list of all supported encodings can be found [here](https://github.com/ashtuchkin/iconv-lite/wiki/Supported-Encodings).
9293
* **Graph**:
9394
* **Colours**: Specifies the colours used on the graph.
9495
* **Style**: Specifies the style of the graph.
9596
* **Uncommitted Changes**: Specifies how the Uncommitted Changes are displayed on the graph.
9697
* **Integrated Terminal Shell**: Specifies the path and filename of the Shell executable to be used by the Visual Studio Code Integrated Terminal, when it is opened by Git Graph.
98+
* **Keyboard Shortcut > \***: Configures the keybindings used for all keyboard shortcuts in the Git Graph View.
9799
* **Markdown**: Parse and render a frequently used subset of inline Markdown formatting rules in commit messages and tag details (bold, italics, bold & italics, and inline code blocks).
98100
* **Max Depth Of Repo Search**: Specifies the maximum depth of subfolders to search when discovering repositories in the workspace.
99101
* **Open New Tab Editor Group**: Specifies the Editor Group where Git Graph should open new tabs, when performing the following actions from the Git Graph View: Viewing the Visual Studio Code Diff View, Opening a File, Viewing a File at a Specific Revision.
@@ -122,9 +124,13 @@ A summary of the Git Graph extension settings are:
122124
* **Only Follow First Parent**: Only follow the first parent of commits when discovering the commits to load in the Git Graph View. See [--first-parent](https://git-scm.com/docs/git-log#Documentation/git-log.txt---first-parent) to find out more about this setting.
123125
* **Show Commits Only Referenced By Tags**: Show Commits that are only referenced by tags in Git Graph.
124126
* **Show Remote Branches**: Show Remote Branches in Git Graph by default.
127+
* **Show Remote Heads**: Show Remote HEAD Symbolic References in Git Graph.
125128
* **Show Tags**: Show Tags in Git Graph by default.
126129
* **Show Uncommitted Changes**: Show uncommitted changes. If you work on large repositories, disabling this setting can reduce the load time of the Git Graph View.
127130
* **Show Untracked Files**: Show untracked files when viewing the uncommitted changes. If you work on large repositories, disabling this setting can reduce the load time of the Git Graph View.
131+
* **Sign**:
132+
* **Commits**: Enables commit signing with GPG or X.509.
133+
* **Tags**: Enables tag signing with GPG or X.509.
128134
* **Use Mailmap**: Respect [.mailmap](https://git-scm.com/docs/git-check-mailmap#_mapping_authors) files when displaying author & committer names and email addresses.
129135
* **Repository Dropdown Order**: Specifies the order that repositories are sorted in the repository dropdown on the Git Graph View (only visible when more than one repository exists in the current Visual Studio Code Workspace).
130136
* **Retain Context When Hidden**: Specifies if the Git Graph view Visual Studio Code context is kept when the panel is no longer visible (e.g. moved to background tab). Enabling this setting will make Git Graph load significantly faster when switching back to the Git Graph tab, however has a higher memory overhead.
@@ -145,6 +151,7 @@ This extension contributes the following commands:
145151
* `git-graph.clearAvatarCache`: Git Graph: Clear Avatar Cache
146152
* `git-graph.endAllWorkspaceCodeReviews`: Git Graph: End All Code Reviews in Workspace
147153
* `git-graph.endSpecificWorkspaceCodeReview`: Git Graph: End a specific Code Review in Workspace... _(used to end a specific Code Review without having to first open it in the Git Graph View)_
154+
* `git-graph.fetch`: Git Graph: Fetch from Remote(s) _(used to open the Git Graph View and immediately run "Fetch from Remote(s)")_
148155
* `git-graph.removeGitRepository`: Git Graph: Remove Git Repository... _(used to remove repositories from Git Graph)_
149156
* `git-graph.resumeWorkspaceCodeReview`: Git Graph: Resume a specific Code Review in Workspace... _(used to open the Git Graph View to a Code Review that is already in progress)_
150157
* `git-graph.version`: Git Graph: Get Version Information

‎package.json‎

Lines changed: 155 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "git-graph",
33
"displayName": "Git Graph",
4-
"version": "1.27.0",
4+
"version": "1.28.0",
55
"publisher": "mhutchie",
66
"author": {
77
"name": "Michael Hutchison",
@@ -70,6 +70,11 @@
7070
"command": "git-graph.endSpecificWorkspaceCodeReview",
7171
"title": "End a specific Code Review in Workspace..."
7272
},
73+
{
74+
"category": "Git Graph",
75+
"command": "git-graph.fetch",
76+
"title": "Fetch from Remote(s)"
77+
},
7378
{
7479
"category": "Git Graph",
7580
"command": "git-graph.removeGitRepository",
@@ -621,7 +626,8 @@
621626
"git-graph.fileEncoding": {
622627
"type": "string",
623628
"default": "utf8",
624-
"markdownDescription": "The character set encoding used when retrieving a specific version of repository files (e.g. in the Diff View). A list of all supported encodings can be found [here](https://github.com/ashtuchkin/iconv-lite/wiki/Supported-Encodings)."
629+
"markdownDescription": "The character set encoding used when retrieving a specific version of repository files (e.g. in the Diff View). A list of all supported encodings can be found [here](https://github.com/ashtuchkin/iconv-lite/wiki/Supported-Encodings).",
630+
"scope": "resource"
625631
},
626632
"git-graph.graph.colours": {
627633
"type": "array",
@@ -678,6 +684,138 @@
678684
"description": "Specifies the path and filename of the Shell executable to be used by the Visual Studio Code Integrated Terminal, when it is opened by Git Graph. For example, to use Git Bash on Windows this setting would commonly be set to \"C:\\Program Files\\Git\\bin\\bash.exe\". If this setting is left blank, the default Shell is used.",
679685
"scope": "machine"
680686
},
687+
"git-graph.keyboardShortcut.find": {
688+
"type": "string",
689+
"enum": [
690+
"CTRL/CMD + A",
691+
"CTRL/CMD + B",
692+
"CTRL/CMD + C",
693+
"CTRL/CMD + D",
694+
"CTRL/CMD + E",
695+
"CTRL/CMD + F",
696+
"CTRL/CMD + G",
697+
"CTRL/CMD + H",
698+
"CTRL/CMD + I",
699+
"CTRL/CMD + J",
700+
"CTRL/CMD + K",
701+
"CTRL/CMD + L",
702+
"CTRL/CMD + M",
703+
"CTRL/CMD + N",
704+
"CTRL/CMD + O",
705+
"CTRL/CMD + P",
706+
"CTRL/CMD + Q",
707+
"CTRL/CMD + R",
708+
"CTRL/CMD + S",
709+
"CTRL/CMD + T",
710+
"CTRL/CMD + U",
711+
"CTRL/CMD + V",
712+
"CTRL/CMD + W",
713+
"CTRL/CMD + X",
714+
"CTRL/CMD + Y",
715+
"CTRL/CMD + Z"
716+
],
717+
"default": "CTRL/CMD + F",
718+
"description": "The keybinding for the keyboard shortcut that opens the Find Widget in the Git Graph View."
719+
},
720+
"git-graph.keyboardShortcut.refresh": {
721+
"type": "string",
722+
"enum": [
723+
"CTRL/CMD + A",
724+
"CTRL/CMD + B",
725+
"CTRL/CMD + C",
726+
"CTRL/CMD + D",
727+
"CTRL/CMD + E",
728+
"CTRL/CMD + F",
729+
"CTRL/CMD + G",
730+
"CTRL/CMD + H",
731+
"CTRL/CMD + I",
732+
"CTRL/CMD + J",
733+
"CTRL/CMD + K",
734+
"CTRL/CMD + L",
735+
"CTRL/CMD + M",
736+
"CTRL/CMD + N",
737+
"CTRL/CMD + O",
738+
"CTRL/CMD + P",
739+
"CTRL/CMD + Q",
740+
"CTRL/CMD + R",
741+
"CTRL/CMD + S",
742+
"CTRL/CMD + T",
743+
"CTRL/CMD + U",
744+
"CTRL/CMD + V",
745+
"CTRL/CMD + W",
746+
"CTRL/CMD + X",
747+
"CTRL/CMD + Y",
748+
"CTRL/CMD + Z"
749+
],
750+
"default": "CTRL/CMD + R",
751+
"description": "The keybinding for the keyboard shortcut that refreshes the Git Graph View."
752+
},
753+
"git-graph.keyboardShortcut.scrollToHead": {
754+
"type": "string",
755+
"enum": [
756+
"CTRL/CMD + A",
757+
"CTRL/CMD + B",
758+
"CTRL/CMD + C",
759+
"CTRL/CMD + D",
760+
"CTRL/CMD + E",
761+
"CTRL/CMD + F",
762+
"CTRL/CMD + G",
763+
"CTRL/CMD + H",
764+
"CTRL/CMD + I",
765+
"CTRL/CMD + J",
766+
"CTRL/CMD + K",
767+
"CTRL/CMD + L",
768+
"CTRL/CMD + M",
769+
"CTRL/CMD + N",
770+
"CTRL/CMD + O",
771+
"CTRL/CMD + P",
772+
"CTRL/CMD + Q",
773+
"CTRL/CMD + R",
774+
"CTRL/CMD + S",
775+
"CTRL/CMD + T",
776+
"CTRL/CMD + U",
777+
"CTRL/CMD + V",
778+
"CTRL/CMD + W",
779+
"CTRL/CMD + X",
780+
"CTRL/CMD + Y",
781+
"CTRL/CMD + Z"
782+
],
783+
"default": "CTRL/CMD + H",
784+
"description": "The keybinding for the keyboard shortcut that scrolls the Git Graph View to be centered on the commit referenced by HEAD."
785+
},
786+
"git-graph.keyboardShortcut.scrollToStash": {
787+
"type": "string",
788+
"enum": [
789+
"CTRL/CMD + A",
790+
"CTRL/CMD + B",
791+
"CTRL/CMD + C",
792+
"CTRL/CMD + D",
793+
"CTRL/CMD + E",
794+
"CTRL/CMD + F",
795+
"CTRL/CMD + G",
796+
"CTRL/CMD + H",
797+
"CTRL/CMD + I",
798+
"CTRL/CMD + J",
799+
"CTRL/CMD + K",
800+
"CTRL/CMD + L",
801+
"CTRL/CMD + M",
802+
"CTRL/CMD + N",
803+
"CTRL/CMD + O",
804+
"CTRL/CMD + P",
805+
"CTRL/CMD + Q",
806+
"CTRL/CMD + R",
807+
"CTRL/CMD + S",
808+
"CTRL/CMD + T",
809+
"CTRL/CMD + U",
810+
"CTRL/CMD + V",
811+
"CTRL/CMD + W",
812+
"CTRL/CMD + X",
813+
"CTRL/CMD + Y",
814+
"CTRL/CMD + Z"
815+
],
816+
"default": "CTRL/CMD + S",
817+
"description": "The keybinding for the keyboard shortcut that scrolls the Git Graph View to the first (or next) stash in the loaded commits. The Shift Key Modifier can be applied to this keybinding to scroll the Git Graph View to the last (or previous) stash in the loaded commits."
818+
},
681819
"git-graph.markdown": {
682820
"type": "boolean",
683821
"default": true,
@@ -843,6 +981,11 @@
843981
"default": true,
844982
"description": "Show Remote Branches in Git Graph by default. This can be overridden per repository from the Git Graph View's Control Bar."
845983
},
984+
"git-graph.repository.showRemoteHeads": {
985+
"type": "boolean",
986+
"default": true,
987+
"description": "Show Remote HEAD Symbolic References in Git Graph (e.g. \"origin/HEAD\")."
988+
},
846989
"git-graph.repository.showTags": {
847990
"type": "boolean",
848991
"default": true,
@@ -858,6 +1001,16 @@
8581001
"default": true,
8591002
"description": "Show untracked files when viewing the uncommitted changes. If you work on large repositories, disabling this setting can reduce the load time of the Git Graph View."
8601003
},
1004+
"git-graph.repository.sign.commits": {
1005+
"type": "boolean",
1006+
"default": false,
1007+
"description": "Enables commit signing with GPG or X.509."
1008+
},
1009+
"git-graph.repository.sign.tags": {
1010+
"type": "boolean",
1011+
"default": false,
1012+
"description": "Enables tag signing with GPG or X.509."
1013+
},
8611014
"git-graph.repository.useMailmap": {
8621015
"type": "boolean",
8631016
"default": false,

0 commit comments

Comments
 (0)