profile
viewpoint
遗忘
Michael Hutchison mhutchie Sydney, Australia Software Engineer | vscode-git-graph

mhutchie/vscode-git-graph 531

View a Git Graph of your repository in Visual Studio Code, and easily perform Git actions from the graph.

mhutchie/remoteit-api-clients 1

A collection of API clients providing integration with remote.it API's, in a variety of programming languages.

mhutchie/update-milestone-on-release 1

A GitHub action that updates and closes milestones automatically when a matching release is published.

issue commentmhutchie/vscode-git-graph

The pasted content doubling what is copied!

Hi @cateyes99,

This is a bug introduced in Visual Studio Code 1.47, that affects all extensions that use Webviews (including the Git Graph View).

It has been reported to Microsoft by heaps of users globally since it was first introduced over a week ago, and although they have fixed it, the fix hasn’t been released yet. It was targeted for the recovery release, but it doesn’t look like it has made it in - hopefully the fix will be released soon.

The VSCode bug: https://github.com/microsoft/vscode/issues/101946

cateyes99

comment created time in 13 hours

issue closedmhutchie/vscode-git-graph

pin

Describe the feature that you'd like With the new VSCode pin tabs feature, is there any chance too see if this could also be implemented to this extension so it stays pinned per project?

I understand there were some requests of this type previously, but perhaps this feature would make it more possible?

closed time in a day

caasi-dev

issue commentmhutchie/vscode-git-graph

pin

Thanks for clarifying that.

Unfortunately the recently introduced pin functionality is completely independent of the underlying Visual Studio Code limitation I previously outlined here, that is preventing the Git Graph View (a Webview) from being restored across Visual Studio Code sessions.

As I previously mentioned, I'm keen to enable this capability as soon as Visual Studio Code addresses the underlying issue. I closely monitor all Visual Studio Code releases for a variety features and changes that would enable new capabilities in Git Graph, so I can re-open feature requests that were previously unachievable and temporarily moved to the backlog.

I'll close this feature request, as the delivery of the underlying Git Graph View tab restoration capability will be tracked in #276.

caasi-dev

comment created time in a day

issue commentmhutchie/vscode-git-graph

pin

Hi @caasi-dev,

From what I can see, the Git Graph View can be pinned just like any other tab: image

Could you please clarify what you mean by "so it stays pinned per project"?

caasi-dev

comment created time in a day

issue commentmhutchie/vscode-git-graph

Option to move graph icon in the commit editor toolbar into overflow menu/hide

@jsg2021, All good!

The number of extension settings has been steadily growing since I first created Git Graph, and consequently it’s become harder and harder for users to find the specific setting they need. In an upcoming release I plan on improving how the settings are structured, so hopefully they should be easier to find.

jsg2021

comment created time in 2 days

issue closedmhutchie/vscode-git-graph

Option to move graph icon in the commit editor toolbar into overflow menu/hide

Describe the feature that you'd like With the latest vscode, they changed the way repos are displayed. It would be nice to declutter this view a bit.

Additional context (optional) Add any other context or screenshots about the feature request here. image

closed time in 2 days

jsg2021

issue commentmhutchie/vscode-git-graph

Option to move graph icon in the commit editor toolbar into overflow menu/hide

Hi @jsg2021,

The existing extension setting Source Code Provider Integration Location can be set to More Actions. This will move the Git Graph button into the overflow menu, as you're requesting.

In the past this setting change reflected immediately in the Visual Studio Code Source Control View, however from what I can see it seems that now they require Visual Studio Code to be restarted for this setting to take affect. This mechanism is completely managed by Visual Studio Code, so I'm unable to make the setting change reflect sooner.

jsg2021

comment created time in 2 days

issue closedmhutchie/vscode-git-graph

Please relase 1.25

i am using 1.25 features can u release, manuel import not sexy on share gir graph

closed time in 2 days

firattaskin

issue commentmhutchie/vscode-git-graph

Please relase 1.25

Hi @firattaskin,

Apologies for the delay in getting Git Graph 1.25.0 released, I’ve been unwell the last week and a half so haven’t been able to complete the final testing of the release. I’m starting to feel much better the last few days, so I intend to get the release on this coming weekend.

firattaskin

comment created time in 2 days

issue closedmhutchie/vscode-git-graph

Unable To Load Repository Settings

gitconfig

Recently on git graph, every time I click on it's setting icon, I get an error saying I am unable to load the repository settings. Need help :(

closed time in 2 days

rchavezj

issue commentmhutchie/vscode-git-graph

Unable To Load Repository Settings

Hi @rchavezj,

Git Graph runs these three standard Git commands from the repositories root directory when loading the Repository Settings Widget:

  1. git --no-pager config --list --local
  2. git --no-pager config --list --global
  3. git remote

If you open a Visual Studio Code Terminal to the root directory of the repository, and try running each of these commands, you should be able to observe one of them returning the same Git error that Git Graph is passing on to you in the UI. (I'm guessing it would most likely be thrown by the second command).

Once you've identified the Git command causing the problem, you should then be able to do a quick Google search to identify steps to resolve this underlying Git configuration issue on your computer.

I'll close this question as it appears to most likely be caused by a local Git configuration issue on your computer (Git Graph is just passing on the Git error message to you). I'll still receive notifications of any replies you make, so we can continue to discuss further troubleshooting steps if necessary.

rchavezj

comment created time in 2 days

issue closedmhutchie/vscode-git-graph

crtl + v command pastes double

Describe the Bug Pasting anything into Add-Tag textfields doubles the pasted text

Video Proof

Environment

  • Git Graph Extension Version: v1.24.0
  • Visual Studio Code Version: 1.47.0 on remote WSL v0.44.4
  • Operating System: Windows 10

⚠ Please make sure you complete all of the required sections of this template. Without this required information, it will be harder to replicate this bug, and cause additional delays in resolving it.

closed time in 3 days

Qadosch

issue commentmhutchie/vscode-git-graph

crtl + v command pastes double

This is a bug that was introduced in Visual Studio Code 1.47.0, which affects all extensions that use Webview's (including the Git Graph View). Microsoft has been made aware of this as it is affecting heaps of users, and they have implemented a fix for it that will be available in the next Visual Studio Code recovery release (e.g. 1.47.1).

More information is available here.

Qadosch

comment created time in 3 days

issue commentmicrosoft/vscode

Pasting in jupyter notebook

@bpasero, The clipboard contents are inserted twice per CTRL-V in Webview's from all extensions (this is not specific to Jupyter Notebook). It affects my extension (Git Graph), and every other Webview-based extension I'm aware of. It was definitely introduced in vscode 1.47.0.

FYI: I can only replicate this bug on Windows, my Mac device still functions correctly.

@mjbvz, are you aware of this given your recent changes to the Webview implementation.

shubhamsharma10

comment created time in 4 days

issue closedmhutchie/vscode-git-graph

Automatic GitHub authentication

Describe the improvement that you'd like VS Code now supports automatic GitHub authentication for git commands executed via the Source Control pane. It would be excellent if Git Graph could tap into this functionality so we don't always have to prompt for login information (or setup SSH keys).

closed time in 6 days

mill1000

issue commentmhutchie/vscode-git-graph

Automatic GitHub authentication

Thanks @mill1000, based on the information you've provided I've being able to track down how GitHub authentication is now integrated with Visual Studio Code.

Microsoft have introduced three new built-in extensions around the end of February this year: vscode.github, vscode.github-authentication & vscode.github-browser.

Based on my exploration of the code, vscode.github-authentication is handling the authentication for these new GitHub extensions, and the existing vscode.git extension (which manages the Source Control View). It is using a custom-built GitHub integration specifically for Visual Studio Code (see here), that is registered as a remote source provider for vscode.git to use here in vscode.github. For Microsoft and GitHub to create an entirely new purpose-built system, it indicates to me that this must be the only feasible solution, and all other existing (simpler) git-based systems were inadequate. It also means that extensions (such as Git Graph) can't directly use the same underlying authentication method as it is not a publicly available system.

Currently Visual Studio Code does not allow extensions to access any authentication providers (such as the one by vscode.github), however they do plan to expose them soon as it's included in their Proposed API. This would theoretically allow extensions (such as Git Graph) to leverage the GitHub authentication system they have built. As this will be coming soon, I'll close this improvement request and move it to the backlog until (1) it is available & (2) I can upgrade the minimum version requirement of the extension to the corresponding vscode release without losing too many existing Git Graph users. Once these conditions are met I'll re-open this request and implement it, as I'm really keen to improve this experience for GitHub users.

In the meantime, I'd encourage you have a look at the various Git credential mechanisms (different for each platform), that can be easily configured using the information on this page. Using Git based authentication methods will allow yourself, or any program that runs git commands on your behalf (like Git Graph) to communicate with remotes (such as GitHub) without having to prompt for your credentials.

mill1000

comment created time in 6 days

issue closedmhutchie/vscode-git-graph

Viewing graph of single file's changes?

Describe the feature that you'd like You can run git log --graph -- path/to/file to view the history of a single file. Is it possible to perform this in VSCode Git Graph?

Additional context (optional) This feature is already implemented in some Git graph viewers. I took some screenshots of a file which I modified in several non-adjacent commits.

Git Cola DAG is weird. By default, it doesn't connect commits. If you type --all, it connects direct parent-child commits.

git dag single file

git log --graph (with/without --all) connects all nodes, regardless of whether they're direct parent-child or not.

git log single file

tig connects all nodes, regardless of whether they're direct parent-child or not. But you can't see any vertical lines except in the presence of merges or splits. I don't know if merge commits are shown if they edit path/to/file or not.

tig single file

closed time in 8 days

nyanpasu64

issue commentmhutchie/vscode-git-graph

Viewing graph of single file's changes?

Hi @nyanpasu64, Thanks for raising this feature request, and providing the detailed examples of how this is implemented in other tools.

This functionality is already within the scope of what I intend to deliver in the existing feature request #70, so I’ll close this one. Please follow #70 to keep up to date on the progress and delivery of it.

nyanpasu64

comment created time in 8 days

issue commentmhutchie/vscode-git-graph

Automatic GitHub authentication

The URL you provided indicates that the authentication is being performed by the GitHub produced “GitHub Pull Request and Issue” extension. It would be helpful if you could confirm whether this is actually what is allowing the GitHub authentication for you. You should be able to:

  1. Check if the GitHub produced extension is installed.
  2. If so, disable the GitHub produced extension, and see if you still don’t need to provide credentials.
mill1000

comment created time in 8 days

issue commentmhutchie/vscode-git-graph

Automatic GitHub authentication

Hi @mill1000,

Which platform are you using? Most platforms have pretty standard methods for caching Git credentials, so you don’t have to keep entering them (this is what I use on both Windows and Mac to allow Git Graph to automatically authenticate with GitHub, along with many Git Graph users).

Could you please provide a link to some documentation explaining the Visual Studio Code functionality you’re describing, I wasn’t aware of any vscode changes to this (are you referring to the “GitHub Pull Request and Issue“ extension - produced by GitHub). Unfortunately there are several reasons why Git Graph can’t directly integrate with the Visual Studio Code Git Extension (which provides the Source Control View), or other extensions that may or may not be installed on the users vscode environment. In saying that, up until now I’ve ensured that Git Graph exactly matches the Visual Studio Code Git credential handling, so if you could help clarify exactly which functionality you’re referring to, I’d be keen to implement equivalent capabilities in Git Graph if it is at all possible.

mill1000

comment created time in 8 days

push eventmhutchie/vscode-git-graph

Michael Hutchison

commit sha c483eeb483aa457e32df9e7d9ba4f70d0bad78e0

Standardised the usage of exit code / signal checks of spawned child processes when finding the users Git executable.

view details

push time in 12 days

issue commentmhutchie/vscode-git-graph

Optional default for remote branch display setting

@niccolomineo, thanks for confirming that!

I'll add this as an extension setting in an upcoming release. This will make it consistent with other settings like "Show Tags" (where the default global value can be set via the extension setting, and then it can be overridden locally per repository).

niccolomineo

comment created time in 12 days

issue commentmhutchie/vscode-git-graph

Optional default for remote branch display setting

Hi @niccolomineo,

Isn't this already covered by the "Show Remote Branches" checkbox on the Git Graph View top control bar? Although it defaults to true for new repositories, it's state (set by the user) is persisted per repository across sessions.

niccolomineo

comment created time in 12 days

push eventmhutchie/vscode-git-graph

Michael Hutchison

commit sha 154e8e5ae33994c68320c4dbed5f36e9960b618f

Use promise wrapped Child Process Readable Streams when finding the users Git exectutable.

view details

push time in 12 days

issue closedmhutchie/vscode-git-graph

Global search shortcut overridden when on Git Graph tab

On Mac, when on the Git Graph tab, CMD+Shift+f opens the current file search, not the global one (sidebar), as it should instead.

MacOs Catalina Git Graph 1.24.0

closed time in 12 days

niccolomineo

issue commentmhutchie/vscode-git-graph

Global search shortcut overridden when on Git Graph tab

Hi @niccolomineo,

I noticed this myself about a week ago and fixed it in 2ed0f2e8.

It will be available in v1.25.0. If you'd like to get this fix now, you can download v1.25.0-beta.2, and install it following the instructions provided here.

Previously the keyboard shortcut detection code checked for CTRL/CMD + F, but didn't explicitly ensure that the shift modifier wasn't pressed. Windows users weren't affected as e.key is case sensitive (and the shift modifier check isn't required), whereas on Macs e.key is case insensitive and is normalized to lower case (making an explicit shift modifier check required).

niccolomineo

comment created time in 12 days

issue closedmhutchie/vscode-git-graph

Improve Commit Details View File Tree for deeply nested directory structures.

In git-graph's commit tree, if you have a file located in a directory that's a leaf of a deep enough tree, the icons next to the filename get cut beyond the right cell margin.

Steps to Reproduce Steps to reproduce the behaviour:

  1. Go to the git graph
  2. Click on a commit in which a file is in a directory that's a leaf of a deep enough tree
  3. Icons next to the filename get cut beyond the right cell margin.

Expected Behaviour I should be able to see and click on each of those icons. Having a horizontal scrollbar for that table cell could help.

Environment

  • Git Graph Extension Version: 1.24.0
  • Visual Studio Code Version: 1.46.1
  • Operating System: MacOs Catalina

closed time in 12 days

niccolomineo

issue commentmhutchie/vscode-git-graph

Improve Commit Details View File Tree for deeply nested directory structures.

I've enhanced the Commit Details View File Tree renderer to better display deeply nested directory structures, such that folders with a single child folder are compressed into a single combined folder element. This:

  • Effectively eliminates the need for a horizontal scrollbar as the files are now indented far less, making a lot more room for all information of file nodes (filename, additions/deletions & action buttons).
  • Reduces the vertical space usage of the file tree, as qualifying nested directories are now displayed on a single line.

This will be available in v1.25.0, which will be released in the next day or so.

I'll get more feedback on these changes from a variety of users after the release, to see if the implemented solution meets the needs of deeply nested directory structures. I'm more than happy to make further changes should it be necessary. Please let me know how you find the enhanced renderer after the release, once you find the affected repository you work on.

niccolomineo

comment created time in 12 days

push eventmhutchie/vscode-git-graph

Michael Hutchison

commit sha 079e61c67a6affac1e4c7fcff9c089ac15003d63

#337 Enhanced the Commit Details View File Tree renderer to better display deeply nested directory structures, such that folders with a single child folder are compressed into a single combined folder element.

view details

push time in 12 days

issue commentmhutchie/vscode-git-graph

Stashing gives "a newer version of git is required" error, fixed by VSCode restart

Hi @nickmeinhold,

Thanks for you’re response, from what’s shown in the screenshots Git Graph is only ever using the one Git executable. (you definitely don’t have two versions installed)

However, the a screenshots do explain why you are receiving the error message. On Visual Studio Code startup Git Graph was unable to parse the version number of Git, so when you run “Stash uncomitted changes...“ and Git Graph checks the version number (which couldn’t be parsed), it defaults to return that you don’t have the required Git version.

I’ve already made various improvements to the Git version number retrieval process since you first raised this request, that should prevent you from ever getting this error again. These changes will be released in Git Graph 1.25.0, which I intend to release this weekend.

After you’ve updated to Git Graph 1.25.0 after its release, please let me know if you ever get this again.

nickmeinhold

comment created time in 13 days

issue commentmhutchie/vscode-git-graph

Extension issue

Hi @MSK61,

Thanks for confirming that this was a one-off occurrence. Unless I get reports of this occurring for other users, I’ll treat this as an isolated occurrence that was likely caused externally to Git Graph.

Visual Studio Code used to generate a CPU profile that they would ask the user to manually attach to the GitHub issue they’re asked to raise. This at least provided extension authors a lot more information to see exactly what the extension was doing. Even though it lacked the context of what the user was doing, it at least allowed me to determine if there was a bug in the extension or not.

I’ll follow up on this with the VSCode team, as the template they’ve now changed to (this issue was the first time I saw the new template), really doesn’t give extension authors enough information to work out the cause, other than knowing that the extension started slowly for one user.

MSK61

comment created time in 14 days

issue commentmhutchie/vscode-git-graph

Extension issue

Hi @MSK61,

As you’re reporting a bug, please provide enough information so I know what went wrong, when it occurred, and under what circumstances it occurred, so I have the ability to consistently replicate it. I have provided a Bug Issue template on GitHub so for this reason, in the future please use it.

From the small snippet of data you’ve included it appears that the extension was slow to start. Occasionally (extremely rarely - around 5 times in 16 months & over 500,000 users) I get a report that Git Graph was slow to start, however each time it has been a one-off occurrence attributed due to factors external to Git Graph (e.g. their computer was doing something in the background that affected the performance of all software running on it).

Could you please let me know if this was a one-off occurrence, or it regularly occurs for you? If it does occur regularly, is there anything unique about your computer / system setup that could feasibly be affecting the extensions performance (as there haven’t been any recent reports of other users finding Git Graph slow to start).

MSK61

comment created time in 14 days

issue closedmhutchie/vscode-git-graph

Printout of the graph

Would it be possible to generated a printout of the complete graph. Like a screenshot would do but for the complete graph not just the part that is visible.

closed time in 14 days

raphboll

issue commentmhutchie/vscode-git-graph

Printout of the graph

Hi @raphboll, Thanks for raising this feature request!

This capability is not one that Visual Studio Code provides to extensions, so it is something that I would have to implement in Git Graph itself. After looking at a variety of JavaScript packages online, I couldn't find one that would meet the requirements that I believe this feature would reasonably present, and would accurately deal with the complex graph rendering performed in the Git Graph View. It is also far to complex and time consuming for me to create a custom implementation specifically for Git Graph.

Even if a package did exist, based on what I can see of existing packages they would likely double to quadruple the packaged size of the extension. Although I don't mind doing this, I would only do so if this functionality would regularly be used by a decent number of users.

I'll close the issue for now and add it to the backlog, as primarily I'm unable to find a suitable package that would make this feature feasible, and secondly I don't think enough users would regularly use it for it to be prioritised among most of the open feature requests.

Note to users reading this in the future: If you'd like this functionality, please reply to this thread to express your interest. I'd happily re-open and add this feature if a decent number of users would like it, and a suitable JavaScript package exists (that someone can let me know about).

raphboll

comment created time in 14 days

push eventmhutchie/vscode-git-graph

Michael Hutchison

commit sha d65a3e716ddd3a14d4b943e0e544dabb50dd11dc

Use Typescript index types to simplify saving repository state in the front-end.

view details

push time in 15 days

issue commentmhutchie/vscode-git-graph

vscode-insiders: Webview contents not loading

@LongLiveCHIEF It looks like the version of Visual Studio Code Insiders you have (2020-06-23) is one of the releases with the bug, upgrading to the latest Visual Studio Code Insiders release should fix it for you.

morganlombard

comment created time in 16 days

issue commentmhutchie/vscode-git-graph

Improve Commit Details File View for deeply nested repositories

@niccolomineo, that's really interesting that you have a horizontal scrollbar on the Explorer sidebar, I just checked on a MacOs Catalina computer and I also don't get one on it either (my screenshot was on Windows).

In any case, the perspective I was trying to convey was that I think there are some interesting solutions that I think are better for the user than sacrificing the filename/icons, or adding a horizontal scroll bar. I'll explore these possible solutions and reply back with my findings and implementation, as I definitely want to address this current limitation on deeply nested repositories asap.

I'd be keen if you're able to find a screenshot at some point of the repository you were facing this issue with.

niccolomineo

comment created time in 16 days

issue commentmhutchie/vscode-git-graph

Improve Commit Details File View for deeply nested repositories

Hi @niccolomineo,

The current behaviour is by design, and is consistent with the Visual Studio Code Explorer View (which also doesn't have horizontal scrollbar, and just truncates the content horizontally). This pattern is relatively common for many file-tree-like views across different software products. Without a horizontal scroll bar it's difficult to intelligently abbreviate file-tree-like content, as everything is important (e.g. the folder structure, file name, additions / deletions, action buttons). There is no universal solution of what should be hidden first, so many products simply truncate the content (as does Git Graph). For example (assuming the current behaviour without a horizontal scroll bar), if I were to change it so that the buttons always appeared on the right and didn't overflow, this would mean that the filename / additions / deletions would have to be truncated if the content overflows - in which case the buttons are meaningless if you don't know what file they're for. image

Currently in Git Graph there are two ways that help to minimise / eliminate horizontal truncation in the File View side of the Commit Details View:

  • The divider between the Summary Information (LHS) & File View (RHS) can be dragged horizontally, so that more horizontal screen real-estate can be dedicated to the File View.
  • The File Tree View option reduces horizontal screen usage, while increasing the vertical screen usage when compared to the File List View option.

Additionally, when I first implemented the Commit Details View and decided to truncate horizontal content if it overflows, I kept monitoring for any users reporting that they worked in repositories that are deeply nested, where the current truncation may be less than ideal. In the ~14 months since, and over 500,000 users, not a single other user has raised it as an issue to me (you're the first). Up until now, that was a very good indication to me that the current, very simple, horizontal truncation approach was sufficient for the majority of users, and it wasn't worth adding significant complexity to the code for something that wasn't deemed necessary by users.

If it's possible, it would be great if you could reply with a screenshot of an affected Commit Details File View, as it would give me a sense of the structure of the repository and how you work. I don't care about the file names themselves (you can blur or paint them out if they're confidential), I'm just interested in the structure. Visual Studio Code recently introduced a folder grouping mechanism that reduces the horizontal and vertical consumption of file trees by inlining nested directories with only one child directory - perhaps this is something I could do to help reduce the horizontal usage of the Commit Details File View (in File Tree Mode).

I'm definitely keen to improve the Commit Details File View for deeply nested repositories, I just think it's best to try to find a solution that reduces the horizontal content if possible, so that as much of the content is visible without having to truncate horizontal content or scroll at all.

niccolomineo

comment created time in 16 days

issue commentmhutchie/vscode-git-graph

vscode-insiders: Webview contents not loading

Thanks @volopasse, that’s really useful to know if anyone else is having this issue!

morganlombard

comment created time in 16 days

issue closedmhutchie/vscode-git-graph

Extension Settings to set the default options on the Pull Branch Dialog.

Describe the feature that you'd like Add two extension settings to set the default options of the Pull Branch Dialog:

  • git-graph.dialog.pullBranch.noFastForward
  • git-graph.dialog.pullBranch.squashCommits

Additional context (optional) After adding git-graph.dialog.pullBranch.squashMessageFormat as a result of #331, these settings should be added for completeness.

closed time in 17 days

mhutchie

issue commentmhutchie/vscode-git-graph

Extension Settings to set the default options on the Pull Branch Dialog.

This will be available in v1.25.0.

If you'd like to use it before the next release, you can download v1.25.0-beta.2, and install it following the instructions provided here.

mhutchie

comment created time in 17 days

issue commentmhutchie/vscode-git-graph

Improve squash merge commit message

This will be available in v1.25.0.

If you'd like to use it before the next release, you can download v1.25.0-beta.2, and install it following the instructions provided here.

philipstarkey

comment created time in 17 days

issue closedmhutchie/vscode-git-graph

Improve squash merge commit message

Describe the improvement that you'd like Right now, when you do a squash merge using git-graph it uses a commit message along the lines of: Merge commit 'd8b8343f10ee8235a113a9f18a5b07fe2fa474c3'

A much more detailed message is written to .git/SQUASH_MSG and is automatically used if you were to manually do the commit using: git commit or git commit --no-edit

It would be very useful if there was an option for git-graph to use that detailed squash merge message automatically (basically run git commit --no-edit instead of git commit -m "<one-line git graph message>"). Right now I'm ticking the "squash commits" and "no commit" checkboxes when doing the merge from git-graph and then manually running git commit --no-edit from a terminal.

closed time in 17 days

philipstarkey

issue closedmhutchie/vscode-git-graph

"Open a Terminal for this Repository" Button

If I am inspecting a submodule in git graph, I would love to have ability to open terminal in the root of the current repository, so "git ..." calls would apply to the selected repositroy. Vscode standard command would open terminal at root of the workspace, which is not what I expect in this context.

Simplest solution would be to have a small terminal button in the right-up corner, that would function like "open terminal at path {repo}". If that seems like a waste of real estate, context menu action somewhere on the top bar would also be fine.

closed time in 17 days

SirIntruder

issue commentmhutchie/vscode-git-graph

"Open a Terminal for this Repository" Button

This will be available in v1.25.0.

If you'd like to use it before the next release, you can download v1.25.0-beta.2, and install it following the instructions provided here.

SirIntruder

comment created time in 17 days

created tagmhutchie/vscode-git-graph

tagv1.25.0-beta.2

View a Git Graph of your repository in Visual Studio Code, and easily perform Git actions from the graph.

created time in 17 days

push eventmhutchie/vscode-git-graph

Michael Hutchison

commit sha 3648fae0741b09057c70a9d3885d2e1fb29540fb

#336 Added new extension settings to set the default options on the Pull Branch Dialog.

view details

push time in 19 days

issue openedmhutchie/vscode-git-graph

Extension Settings to set the default options on the Pull Branch Dialog.

Describe the feature that you'd like Add two extension settings to set the default options of the Pull Branch Dialog:

  • git-graph.dialog.pullBranch.noFastForward
  • git-graph.dialog.pullBranch.squashCommits

Additional context (optional) After adding git-graph.dialog.pullBranch.squashMessageFormat as a result of #331, these settings should be added for completeness.

created time in 19 days

push eventmhutchie/vscode-git-graph

Michael Hutchison

commit sha 60e8575ab4afa455550c0e5e2cdbb7434f1ea9a3

#331 Added two Extension Settings to specify message format of the squash commit that is created when the "Squash Commits" option is selected on the Merge & Pull Branch Dialogs respectively.

view details

push time in 19 days

push eventmhutchie/vscode-git-graph

Michael Hutchison

commit sha 2ed0f2e8ed1d5a7d81968f417824dd3d915e6826

Improved the keyboard shortcut implementation in the Git Graph View.

view details

push time in 19 days

issue commentmhutchie/vscode-git-graph

vscode-insiders: Webview contents not loading

@volopasse, Thanks for the additional information. I've been experimenting and still can't observe the 404's you're getting in WSL.

The team at Microsoft have been been rewriting the Webview implementation this iteration, which has been causing all of the bugs we've had recently in the Visual Studio Code Insiders build.

The URI scheme change from vscode-resource://file///<path> to vscode-webview-resource://<some uuid>/file///<path> is just one of these changes. This scheme change has been working for me on Windows, Mac, Windows WSL & Mac Docker, so it shouldn't be the cause.

Would you mind raising this Visual Studio Code Insiders WSL Webview issue you're observing to the vscode team? With all their Webview changes it seems highly likely that this is a bug that they need to resolve. If it's affecting you using Git Graph, it will likely be affecting others who use WSL and any of the extensions that use Webviews. I'll keep an eye out for it, and will provide additional assistance if necessary.

morganlombard

comment created time in 19 days

issue commentmhutchie/vscode-git-graph

vscode-insiders: Webview contents not loading

@volopasse That's really interesting, it would be great if you could spin up a new WSL and see if it persists.

morganlombard

comment created time in 19 days

issue commentmhutchie/vscode-git-graph

vscode-insiders: Webview contents not loading

@volopasse I've just tried Git Graph in WSL with the same Visual Studio Code Insiders release as you're using and everything is working fine for me.

What is the full path of out.min.css & out.min.js, and can you locate it on the file system?

morganlombard

comment created time in 19 days

issue commentmhutchie/vscode-git-graph

Publish on Open VSX

Hi @felipecassiors, Thank you for raising this!

I already intended to do this in around a months time from now.

When I was implementing support for Git Graph in web browser environments (released 13 days ago in Git Graph 1.24.0), I ensured it was compatible with Microsoft's Visual Studio Codespaces (their official web-based platform for Visual Studio Code). This consequently meant the extension was now also compatible with being run the web browsers, including many third-party products.

In doing this, I also tested the extension in some third-party Visual Studio Code compatible products (including Gitpod). Unfortunately I found several bugs in these third-party products that affect some of the rich Visual Studio Code integrations that Git Graph uses. I decided I would give these providers some time to fix these issues while only a relatively small number of users manually install Git Graph. As soon as I publish to Open VSX, the number of Git Graph users on these third-party products will increase rapidly, so I don't want significant volumes of users all facing the same third-party caused bugs.

FYI: It is already a significant effort to both develop Git Graph, and provide support to users on Github (with feature requests, improvements, or issues they are having) - surprisingly it ends up that I split my time almost equally between these two components. While I'm more than happy to publish Git Graph so that it can be used on third-party products, and pleased it will be of value and used by even more users, I don't have much (if any) spare capacity to:

  • Deal with an influx of bugs / issues that people would naturally assume to be in Git Graph, when they are in fact caused by the third-party product itself.
  • Work with each of these third-parties to fix their products.
felipecassiors

comment created time in 19 days

issue closedmhutchie/vscode-git-graph

vscode-insiders: Webview contents not loading

Describe the Bug With the latest VSCode insider release Version: 1.46.0-insider the graph does not show. The Git Graph panel opens, only showing Repo: Branches: [Checkbox] Show Remote Branches

This is both Windows 10 and Ubuntnu 20.04

Steps to Reproduce Steps to reproduce the behaviour:

  1. Open VSCode
  2. Click on 'Git Graph' in bottom left of status bar
  3. Do not see Graph.

Expected Behaviour Expect to see a Graph of commits and branches.

Environment Ubuntu 20.04 Version: 1.46.0-insider Commit: 1bfa086adb9271ff56be11821da686e4cfffb672 Date: 2020-06-02T06:55:30.074Z Electron: 7.3.0 Chrome: 78.0.3904.130 Node.js: 12.8.1 V8: 7.8.279.23-electron.0 OS: Linux x64 5.4.0-33-generic Git Graph v1.23.0

Windows 10 Version: 1.46.0-insider (system setup) Commit: 1bfa086adb9271ff56be11821da686e4cfffb672 Date: 2020-06-02T06:55:33.079Z Electron: 7.3.0 Chrome: 78.0.3904.130 Node.js: 12.8.1 V8: 7.8.279.23-electron.0 OS: Windows_NT x64 10.0.19041 Git Graph v1.23.0

Screenshots (optional) Screenshot from 2020-06-02 15-22-22

closed time in 20 days

morganlombard

issue commentmhutchie/vscode-git-graph

vscode-insiders: Webview contents not loading

Webviews are now working again in Visual Studio Code Insiders:

  • Version: 1.47.0-insider (user setup)
  • Commit: 9bf6af04dcb5c2e531cedca83cd188939ca1b0db
  • Date: 2020-06-26T18:55:07.038Z
  • Electron: 8.3.3
  • Chrome: 80.0.3987.165
  • Node.js: 12.13.0
  • V8: 8.0.426.27-electron.0
  • OS: Windows_NT x64 10.0.18362
morganlombard

comment created time in 20 days

issue commentmicrosoft/vscode

Webview resources not loading - ERR_UNKNOWN_URL_SCHEME (vscode-insiders) (AGAIN)

Thanks @mjbvz & @deepak1556 for getting this resolved!

Webviews are now working again in Visual Studio Code Insiders:

  • Version: 1.47.0-insider (user setup)
  • Commit: 9bf6af04dcb5c2e531cedca83cd188939ca1b0db
  • Date: 2020-06-26T18:55:07.038Z
  • Electron: 8.3.3
  • Chrome: 80.0.3987.165
  • Node.js: 12.13.0
  • V8: 8.0.426.27-electron.0
  • OS: Windows_NT x64 10.0.18362
mhutchie

comment created time in 20 days

issue closedmhutchie/vscode-git-graph

Stashing gives "a newer version of git is required" error, fixed by VSCode restart

Describe the Bug Stashing gives "a newer version of git is required" error

Steps to Reproduce Steps to reproduce the behaviour:

  1. Right click on 'Uncommited Changes'
  2. Click on 'Stash uncomitted changes...'
  3. Click 'Yes, stash'
  4. See error

Expected Behaviour Stash occurs without error

Environment

  • Git Graph Extension Version: 1.24.0
  • Visual Studio Code Version: 1.46.1
  • Operating System: macOS 10.15.5

Screenshots (optional) Screen Shot 2020-06-25 at 1 19 20 pm

Additional Context (optional) Happens regularly but not every time. Restarting VSCode always seems to solve it.

My git version:

~ git --version git version 2.24.3 (Apple Git-128)

closed time in 20 days

nickmeinhold

issue commentmhutchie/vscode-git-graph

Stashing gives "a newer version of git is required" error, fixed by VSCode restart

I'll close this issue for now, as every indication I have suggests this is not actually a bug, and is being caused by something specific to your environment (e.g. multiple git installations).

Please report back with the requested information when you next see the error message. In the event that this is a bug, I'll reopen this issue and resolve it as soon as possible.

nickmeinhold

comment created time in 20 days

issue closedmhutchie/vscode-git-graph

sometimes it work, sometimes it doesnt

Describe the Bug the graph doesn't always work, whether its a small/large public/private project, the graph have a mind of its own.

Steps to Reproduce

  1. open https://github.com/ctf0/Laravel-Media-Manager in vscode
  2. Click on status bar git graph btn
  3. see a white/blank page

Expected Behavior the graph should work consistently

Environment

  • Git Graph Extension Version: 1.24.0
  • Visual Studio Code Version: 1.47.0-insider
  • Operating System: OSX 10.14.6

closed time in 20 days

ctf0

issue commentmhutchie/vscode-git-graph

sometimes it work, sometimes it doesnt

Microsoft currently has a bug in their recent Visual Studio Code Insiders releases that is causing the Git Graph View to not load. It affects all extensions that use Webview's, which includes the Git Graph View. More information is provided in the existing open issue #317.

Microsoft has also had a similar intermittent bug over the last few months that they recently resolved (aside from it not working at all in the latest Insiders builds).

I've raised this bug with Microsoft in #101093, and previously in #100918, and they are working to resolve this. Apologies for the inconvenience, I also hope it is resolved as soon as possible. Please monitor the #317 thread to get notified when this issue is fixed by Microsoft.

FYI: In the meantime you can use the standard Visual Studio Code as it is far more stable at the moment.

ctf0

comment created time in 20 days

issue commentmhutchie/vscode-git-graph

vscode-insiders: Webview contents not loading

I've raised this with Microsoft again, hopefully it will be fixed soon...

morganlombard

comment created time in 20 days

issue openedmicrosoft/vscode

Webview resources not loading - ERR_UNKNOWN_URL_SCHEME (vscode-insiders)

This bug was first reported in #100879 & #100918, was fixed in Visual Studio Code Insiders 9b620b2, then reintroduced in the latest Visual Studio Code Insiders release (information below).

Please fix this immediately - it has already affected all Visual Studio Code Insiders users of many extensions (including my own) for 2.5 days just to get it fixed the first time, no it's broken again!


<!-- ⚠️⚠️ Do Not Delete This! bug_report_template ⚠️⚠️ --> <!-- Please read our Rules of Conduct: https://opensource.microsoft.com/codeofconduct/ --> <!-- Please search existing issues to avoid creating duplicates. --> <!-- Also please test using the latest insiders build to make sure your issue has not already been fixed: https://code.visualstudio.com/insiders/ -->

<!-- Use Help > Report Issue to prefill these. -->

  • Version: 1.47.0-insider (user setup)
  • Commit: 6c235c723cb2d8defb840f732eac620f54aa8b9d
  • Date: 2020-06-26T06:20:06.931Z
  • Electron: 8.3.3
  • Chrome: 80.0.3987.165
  • Node.js: 12.13.0
  • V8: 8.0.426.27-electron.0
  • OS: Windows_NT x64 10.0.18362

I'm the author of the Git Graph extension. This bug is affecting all Git Graph users that use Visual Studio Code Insiders, as well as every other extension I'm aware of that loads resources (e.g. CSS, JS) in Webview's (more specifically, resources loaded by Webview.asWebviewUri). I can replicate bug on Windows & Mac, I've had reports of this from many users.

Steps to Reproduce:

  1. Install an extension that uses a Webview (Git Graph for the following steps)
  2. Open Visual Studio Code in a Git repository.
  3. Click the "Git Graph" Status Bar Item
  4. Observe that the CSS & JS resources aren't loaded: image
  5. If you run the Visual Studio Code command "Open Webview Developer Tools", the following errors can be seen: image

<!-- Launch with code --disable-extensions to check. --> Does this issue occur when all extensions are disabled?: No (Because it only affects extensions that use Webview's)

The resolution of this issue is being tracked for Git Graph users here.

created time in 20 days

issue commentmicrosoft/vscode

Webview resources not loading - ERR_UNKNOWN_URL_SCHEME (vscode-insiders)

@mjbvz I've had reports that this was fixed in the Insiders release 9b620b2, however it is broken again for every user I've checked with in:

Version: 1.47.0-insider (user setup) Commit: 6c235c723cb2d8defb840f732eac620f54aa8b9d Date: 2020-06-26T06:20:06.931Z Electron: 8.3.3 Chrome: 80.0.3987.165 Node.js: 12.13.0 V8: 8.0.426.27-electron.0 OS: Windows_NT x64 10.0.18362

How could this occur again?

mhutchie

comment created time in 20 days

issue commentmicrosoft/vscode

Markdown preview fails to load required CSS and JS on VSCode startup

@mjbvz I've had reports that this was fixed in the Insiders release 9b620b2, however it is broken again for every user I've checked with in:

Version: 1.47.0-insider (user setup) Commit: 6c235c723cb2d8defb840f732eac620f54aa8b9d Date: 2020-06-26T06:20:06.931Z Electron: 8.3.3 Chrome: 80.0.3987.165 Node.js: 12.13.0 V8: 8.0.426.27-electron.0 OS: Windows_NT x64 10.0.18362

How could this occur?

JoernBerkefeld

comment created time in 20 days

issue commentmhutchie/vscode-git-graph

vscode-insiders: Webview contents not loading (fixed, released in next vscode-insiders build)

It seems to be broken again in the next Insiders build:

Version: 1.47.0-insider (user setup) Commit: 6c235c723cb2d8defb840f732eac620f54aa8b9d Date: 2020-06-26T06:20:06.931Z Electron: 8.3.3 Chrome: 80.0.3987.165 Node.js: 12.13.0 V8: 8.0.426.27-electron.0 OS: Windows_NT x64 10.0.18362

morganlombard

comment created time in 20 days

issue closedmhutchie/vscode-git-graph

Git Graph does not work properly in VS Code Insiders v1.47.0, but works great in VS Code v1.46.0.

Issue Type: <b>Bug</b>

Git Graph does not work properly in VS Code Insiders v1.46.1, but works great in VS Code v1.46.0.

Extension version: 1.24.0 VS Code version: Code - Insiders 1.47.0-insider (0913b1aa43191d8af0ccb4a133d9a8d7c1a81d69, 2020-06-23T09:03:35.861Z) OS version: Windows_NT x64 10.0.17134

<details> <summary>System Info</summary>

Item Value
CPUs Intel(R) Core(TM) i7-6500U CPU @ 2.50GHz (4 x 2592)
GPU Status 2d_canvas: enabled<br>flash_3d: enabled<br>flash_stage3d: enabled<br>flash_stage3d_baseline: enabled<br>gpu_compositing: enabled<br>multiple_raster_threads: enabled_on<br>oop_rasterization: disabled_off<br>opengl: enabled_on<br>protected_video_decode: unavailable_off<br>rasterization: enabled<br>skia_renderer: disabled_off_ok<br>video_decode: enabled<br>viz_display_compositor: enabled_on<br>webgl: enabled<br>webgl2: enabled
Load (avg) undefined
Memory (System) 7.88GB (1.11GB free)
Process Argv
Screen Reader no
VM 0%

</details> <!-- generated by issue reporter -->

closed time in 21 days

LeonidRosin

issue commentmhutchie/vscode-git-graph

Git Graph does not work properly in VS Code Insiders v1.47.0, but works great in VS Code v1.46.0.

Closing as this is a duplicate of #317.

It is caused by a bug introduced by Microsoft in the latest Insiders build, that affects all extensions that use Webview's. As indicated by the linked issue, Microsoft has fixed the issue and it should be fixed in the next Insiders release.

LeonidRosin

comment created time in 21 days

issue commentmhutchie/vscode-git-graph

Improve squash merge commit message

@philipstarkey,

Thanks for confirming that this will work for you, I'll add the extension setting in the next few days.

As for "squash commits" and "no commit": The Visual Studio Code Git Extension's Message Input is automatically populated with the contents of .git/MERGE_MSG, however they don't appear to do the same for .git/SQUASH_MSG. I think this should be raised as a feature in the vscode repository, as then anyone doing a squash merge can benefit from modifying the squash message in the Visual Studio Code Git Extension (not just Git Graph users).

Out of curiosity I had a look at how vscode-pull-request-github populates the commit message (see here): As the extension is made by Microsoft they integrate with the Visual Studio Code Git Extension's repository representation, which allows access to set the input field. I've deliberately avoided using the Visual Studio Code Git Extension's repository representation, as they have many restrictions that would have prevented heaps of functionality that is available in Git Graph - things most Git Graph users take for granted. It would be a mess to be dealing with both Git Graph's repository representation and the Visual Studio Code Git Extension's.

philipstarkey

comment created time in 21 days

issue commentmhutchie/vscode-git-graph

Improve squash merge commit message

Hi @philipstarkey,

Thanks for raising this improvement request! I wasn't aware of the SQUASH_MSG file, thanks for letting me know.

From what I can see, when git merge <branch> --squash is followed by git commit --no-edit, a message of the following format is used for the commit:

Squashed commit of the following:

commit d3b7ca77ac44868d3a223cb6404036d2f8069f30
Author: Michael Hutchison <test@mhutchie.com>
Date: Sun Jan 19 11:18:41 2020 +1100

    Commit Message
...

This means that the commit subject (what is shown in the Description column of Git Graph), is just "Squashed commit of the following:".

There doesn't appear to be a way with git commit for to prepend the SQUASH_MSG with a nice one-line subject (e.g. "Merge branch 'test'").

If you're fine with this, please let me know as I'd be happy to add an extension setting to let users choose their preferred format (the existing behaviour, or SQUASH_MSG).

philipstarkey

comment created time in 21 days

issue closedmhutchie/vscode-git-graph

Permission denied on push

Since a while it is not possible to push data to local git repro. The log writes:

_Please make sure you have the correct access rights and the repository exists.

git push origin v3-rc4:v3-rc4 Permission denied, please try again. Permission denied, please try again. xxxx@yyyy: Permission denied (publickey,password). fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists._

The strange thing is that it works with program like "fork" (MacOS), which is using .gitconfig too. So it is not a wrong config.

The push operation is configured with ssh (HTTPS/HTTP are not allowed on my server).

Environment

  • Git Graph Extension Version: 1.24.0
  • Visual Studio Code Version: 1.46.1
  • Operating System: MacOS Catalina 10.15.5

Pls help! Thx!

closed time in 21 days

elementalPRESS

issue commentmhutchie/vscode-git-graph

Permission denied on push

Hi @elementalPRESS,

Git Graph (like all Node.js applications - including Visual Studio Code itself) has to spawn all git commands using the Node.js Child Process Module. As it runs the command as a child process, and not in a terminal, git will still try to request the password from the user. For some Git authentication methods (like Askpass), Git Graph can intercept these requests and pass them onto the user, and provide the users response them back to Git. However Git requests the SSH Key Password via another mechanism, such that there is no method available in Node.js that allows this to be intercepted and passed onto to the user. Another user had previously brought this to my attention - at the time there was no known solution I could find, and nor has anyone else provided one since (which I requested in the previous issue if anyone was aware of a work-around). Unfortunately it's still my belief that this is just not possible for Git Graph or Visual Studio Code, as they are both based on Node.js (and there's no other alternative).

You should be able to observe the same error message if you run the "Git: Push" command in the Visual Studio Code Command Palette, as Visual Studio Code's Git Extension also has the same limitations.

There are a variety of other platform specific methods that you can find on Google to avoid Git needing to use the SSH Key Password prompt (e.g. not using a password with the SSH Key, or caching etc.). I'd suggest that you use one of the methods, that way both Visual Studio Code and Git Graph can push branches.


Like the previous issue, if you're another user reading this in the future and are aware of a work around, please let me know. I'm definitely keen to fix the current behaviour, however there just doesn't appear to be a feasible solution.

elementalPRESS

comment created time in 21 days

issue commentmhutchie/vscode-git-graph

Permission denied on push

Hi @elementalPRESS,

Could you please describe what occurs when you run the same git command in the Visual Studio Code Terminal git push origin v3-rc4:v3-rc4? What is the output, are any prompts shown etc.

Likely you will need to accept a key (or similar). After completing the push successfully (via the git push command above), please try again using the push branch action in Git Graph and report whether the action ran successfully or the error message in the dialog.

elementalPRESS

comment created time in 21 days

issue commentmhutchie/vscode-git-graph

Stashing gives "a newer version of git is required" error, fixed by VSCode restart

Hi @nickmeinhold,

Unlike most Git integrations that Git Graph has, stashing uncommitted changes has the minimum version required of Git 2.13.2 (when git stash push was added to Git).

On extension startup, Git Graph has to find the Git executable on the users computer, and follows the steps:

  1. Does the last used Git executable still exist? If yes, continue to use it, else proceed with Step 2.
  2. Does the Visual Studio Code Setting git.path refer to a valid Git executable (if set)? If yes, use it, else proceed with Step 3.
  3. Find the Git executable according to the platform (e.g. which git, PATH etc.)

The logic used in Steps 2 & 3 is identical to the Visual Studio Code Git Extension. There has been no code change at all to the implementation of these steps since I first standardised it with the Visual Studio Code Git Extension over 11 months ago. With so many users using Git Graph on a daily basis, it seems extremely unlikely that there is bug as it would have affected so many other users already, and there have been no reports of this by any other user.

I remember only one case that is remotely similar to this, it was caused because the user had multiple versions of Git installed on their computer. When they uninstalled the unintentional version of Git, the issue was resolved (as expected).

This seems highly likely to me to be what your observing, as for the rest of Git Graph to load correctly it must be using a valid Git executable, but not the one you're expecting (v2.24.3).

On startup, the Git executable that Git decides to use is logged to the Git Graph Output Channel as shown below: image

When you next observe the error message you describe, please have a look at the Output Channel to see which Git executable Git Graph is using (and it's version number). This should help you troubleshoot if you do have multiple versions of Git unintentionally installed on your computer. If you observe this error message, and the Git executable used by Git Graph (shown in the Output Channel) does have the required version number, please let me know and provide the Output Channel contents. This would be a bug I want to fix ASAP if this is the case.

nickmeinhold

comment created time in 21 days

issue commentmicrosoft/vscode

What changed in Insiders 1.47.0 that prevents extensions from rendering images?

This is the same bug as the one I've already raised in #100918, that is affecting all Git Graph users that use Visual Studio Code Insiders, as well as every other extension I'm aware of that loads resources (e.g. CSS, JS) in Webview's (more specifically, resources loaded by Webview.asWebviewUri).

cmendible

comment created time in 22 days

issue closedmhutchie/vscode-git-graph

Extension Setting to set the order of repositories in the repository dropdown

Describe the improvement that you'd like Git Graph has a nice handy feature that it has a repo list to show multiple repositories in the subfolders. Currently it doesn't show the repositories in the alphabetic order (seems it shows in the order of the repositories being detected in the subfolders, see the below screenshot). It'd be useful to have a flag so i can instruct Git Graph to show detected multiple repositories in the alphabetic order instead :). It's easy for the user to spot the desired ones when there is a long repository list like in my case, as it's hard to remember the location order of the repository subfolders.

Additional context (optional) Here the Rating.Api repo is on the top of the list above the BT.API.Read repo, becaues the Rating.Api repo is located in the 1st subfolder, & the BT.API.Read repo in the 2nd subfolder etc. image

closed time in 22 days

cateyes99

issue commentmhutchie/vscode-git-graph

Extension Setting to set the order of repositories in the repository dropdown

This will be available in v1.25.0.

If you'd like to use it before the next release, you can download v1.25.0-beta.1, and install it following the instructions provided here.

cateyes99

comment created time in 22 days

created tagmhutchie/vscode-git-graph

tagv1.25.0-beta.1

View a Git Graph of your repository in Visual Studio Code, and easily perform Git actions from the graph.

created time in 22 days

push eventmhutchie/vscode-git-graph

Michael Hutchison

commit sha 115f37109339b9047d1339cdfb9a61625d73cc60

Changed confirmation dialogs to use "Yes, <verb>" & "Cancel" buttons instead of "Yes" & "No" buttons (for consistency with all other dialogs).

view details

push time in 22 days

push eventmhutchie/vscode-git-graph

Michael Hutchison

commit sha cd4aa653b792e300e4c0c014d5f095b837056b29

#321 Added a new Extension Setting "git-graph.repositoryDropdownOrder", to set the order that repositories are sorted in the repository dropdown on the Git Graph View.

view details

push time in 22 days

issue commentmicrosoft/vscode

Webview resources not loading - ERR_UNKNOWN_URL_SCHEME (vscode-insiders)

Looping in @mjbvz.

mhutchie

comment created time in 22 days

issue openedmicrosoft/vscode

Webview resources not loading - ERR_UNKNOWN_URL_SCHEME (vscode-insiders)

<!-- ⚠️⚠️ Do Not Delete This! bug_report_template ⚠️⚠️ --> <!-- Please read our Rules of Conduct: https://opensource.microsoft.com/codeofconduct/ --> <!-- Please search existing issues to avoid creating duplicates. --> <!-- Also please test using the latest insiders build to make sure your issue has not already been fixed: https://code.visualstudio.com/insiders/ -->

<!-- Use Help > Report Issue to prefill these. -->

  • Version: 1.47.0-insider (user setup)
  • Commit: 0913b1aa43191d8af0ccb4a133d9a8d7c1a81d69
  • Date: 2020-06-23T09:03:35.861Z
  • Electron: 8.3.3
  • Chrome: 80.0.3987.165
  • Node.js: 12.13.0
  • V8: 8.0.426.27-electron.0
  • OS: Windows_NT x64 10.0.18362

I'm the author of the Git Graph extension. This bug is affecting all Git Graph users that use Visual Studio Code Insiders, as well as every other extension I'm aware of that loads resources (e.g. CSS, JS) in Webview's (more specifically, resources loaded by Webview.asWebviewUri). I can replicate bug on Windows & Mac, I've had reports of this from many users.

Steps to Reproduce:

  1. Install an extension that uses a Webview (Git Graph for the following steps)
  2. Open Visual Studio Code in a Git repository.
  3. Click the "Git Graph" Status Bar Item
  4. Observe that the CSS & JS resources aren't loaded: image
  5. If you run the Visual Studio Code command "Open Webview Developer Tools", the following errors can be seen: image

<!-- Launch with code --disable-extensions to check. --> Does this issue occur when all extensions are disabled?: No (Because it only affects extensions that use Webview's)

The resolution of this issue is being tracked for Git Graph users here.

created time in 22 days

issue commentmhutchie/vscode-git-graph

vscode-insiders: Webview contents not loading

@mjbvz The bug described below is preventing all Git Graph users that use Visual Studio Code Insiders from using the extension (and affects all extensions that use Webview's) - it is different from the bug you previously fixed. Here's some additional background information:

Starting around Visual Studio Code 1.43.0 (give or take a release), immediately after the vscode release some users intermittently observed that Visual Studio Code would fail to load resources via the vscode-resource scheme. I can also confirm that it occurred using the old direct-set method of vscode-resource, and using the new asWebviewUri method. It has been reported by users on Windows, Mac & Ubuntu (so isn't platform specific). It was fixed for about three weeks, and just a few days ago it started to intermittently affect users. However, in today's insiders build, it seems to not work for everyone, I've got heaps of reports of it.

image

morganlombard

comment created time in 22 days

issue commentmhutchie/vscode-git-graph

Gitgraph not working on VSCode Insiders (v1.46) while using Remote SSH

Please follow #317 for the tracking of this issue being resolved by Microsoft, it is affecting all extensions that use a Webview.

mfmayer

comment created time in 22 days

IssuesEvent

issue commentmhutchie/vscode-git-graph

Gitgraph not working on VSCode Insiders (v1.46) while using Remote SSH

Hi @keisto,

No extensions should impact any others, Microsoft does a great job at isolating them.

Microsoft had fixed this issue for several weeks, but it was unfortunately broken again recently - hopefully they fix it again soon.

mfmayer

comment created time in 22 days

issue closedmhutchie/vscode-git-graph

Rebase Remote branch

After 1.25.0-beta.0 i can merge remote branches without checkout them. But i cant rebase remote braches without checkout still.

closed time in 23 days

firattaskin

issue commentmhutchie/vscode-git-graph

Rebase Remote branch

Hi @firattaskin,

I don’t think it’s appropriate to provide a method of rebasing on remote-tracking branches directly, due to the history rewriting nature of the rebase command. I think it’s best to only provide the capability of rebasing on local branches and commits. After getting feedback from a variety of other Git Graph users, they share a similar opinion.

Note to other users reading this in the future: If you'd like this functionality, please reply to this thread to express your interest. I'd happily re-consider this feature if a decent number of users would regularly use it.

firattaskin

comment created time in 23 days

issue closedmhutchie/vscode-git-graph

Ability to rearrange columns

Please allow the users to rearrange the columns in the preferred order.

After using this extension for a bit I wanted to have the graph centered on the screen and to have the commit messages on the left of it. Unfortunately I was surprized to find out that it's not possible to rearrange the columns.

Other than that the extension is really awesome, keep up the good work 🍻

example (maybe also add optional right alignment?)

closed time in 24 days

duckyb

issue commentmhutchie/vscode-git-graph

Ability to rearrange columns

This issue has been left open for 3 months for others to express interest in this feature. As only a few Git Graph users have indicated they would like this functionality in this period, it confirms my previous sentiment that the majority of users are happy with the current column ordering.

Although this functionality would definitely be nice to have, for the reasons I previously mentioned, I'll close it for now and move it to the backlog.

Note to users reading this in the future: If you'd like this functionality, please reply to this thread to express your interest. I'd happily re-consider, re-open and add this feature if there was any indication it would be used by a decent number of users.

duckyb

comment created time in 24 days

issue closedmhutchie/vscode-git-graph

Add "Push" button in top left of tool bar

Describe the feature that you'd like Dear,

I want a "Push" button in top left of tool bar (please check the screenshot). Because sometimes after I commit somethings by default git tool of vscode, I want to push this commit with one click. But currently I have to right click to branch to push it. This took me more time.

So please consider my request. Thanks.

Additional context (optional) DeepinScreenshot_select-area_20200621180053

closed time in 25 days

hienlh

issue commentmhutchie/vscode-git-graph

Add "Push" button in top left of tool bar

I'm closing this feature request as it is a duplicate of #195, which was closed and moved to the backlog for the reasons detailed in my response.

hienlh

comment created time in 25 days

push eventmhutchie/vscode-git-graph

Michael Hutchison

commit sha dd707d8a770b91e19818996f6062bf75c49dd6fd

Complete test coverage of DataSource & Git executable detection methods. Various other back-end testing improvements.

view details

push time in 25 days

issue closedmhutchie/vscode-git-graph

Cherrypick Dialog: Extension Setting to set the default value for the “No Commit” option

Describe the improvement that you'd like Add a new extension setting to allow the user to set the default value for the “No Commit” option on the Cherrypick Dialog.

Additional context (optional) There is already an extension setting to control the “Record Origin” option on the same dialog.

This improvement request is raised on behalf of a user.

closed time in a month

mhutchie

issue commentmhutchie/vscode-git-graph

Cherrypick Dialog: Extension Setting to set the default value for the “No Commit” option

This will be available in v1.25.0.

If you'd like to use it before the next release, you can download v1.25.0-beta.0, and install it following the instructions provided here.

mhutchie

comment created time in a month

issue closedmhutchie/vscode-git-graph

Add "Merge into current branch..." to the remote branch context menu

in sourceTree i can merge my master branch with any branch. But in GitGraph when i right click to any branch_name i cant see "Merge into Current Branch..." option if i didnt checkout remote branch.

closed time in a month

firattaskin

issue commentmhutchie/vscode-git-graph

Add "Merge into current branch..." to the remote branch context menu

This will be available in v1.25.0.

If you'd like to use it before the next release, you can download v1.25.0-beta.0, and install it following the instructions provided here.

firattaskin

comment created time in a month

more