search

danielroedl / vsc-meld-diff

Visual studio code extension to open two files in the external tool meld.
https://marketplace.visualstudio.com/items?itemName=danielroedl.meld-diff
MIT License
12 stars 6 forks source link

support comparing file against older versions in git #2

Closed hbinkle closed 3 years ago

hbinkle commented 3 years ago

I love the extension but I'm really missing being able to compare against older Git versions.

danielroedl commented 3 years ago

Me too. Same as in issue 3.

danielroedl commented 3 years ago

Hi @hbinkle, I just added source code handling to the version 1.2.0 of meld diff.

What do you mean exactly with 'compare against older Git versions'? Do you mean to enter a commit and than show the diff? Can you explain your idea a little bit more in detail (with a use case)?

Maybe the changes in 1.2.0 are the one you are looking for.

hbinkle commented 3 years ago

Hello Daniel, I'm not sure what v1.2.1 brings new, it does not work for me when calling from the command on the currently opened file: image image

What I mean is the integration into sourcecontrol panel: image

Now I can see the new menu entry: image

but it doesn't work properly. Meld opens with one empty pane: image

I guess the temp file is no longer there. Do you wait until the Meld-Process is closed before delete the temp file?

danielroedl commented 3 years ago

Hello Harald,

the call of this new command from the command menu is not possible. It can only be used from the context menu within the source control window. I add a meaningful error message for this.

Also I found a bug in the reading of the file. Maybe the fix of this bug also get the extension working in your case. Please try out the version 1.2.3 and tell me if the error still remains.

danielroedl commented 3 years ago

Hi @hbinkle, did you have the chance to test the new version and verify the bugfix?

hbinkle commented 3 years ago

Hello @danielroedl, the error message is gone when trying to start using the command pane. But from the context menu in the scm pane it still opens with non existing temp file on the left: image

hbinkle commented 3 years ago

But from the context menu in the scm pane it still opens with non existing temp file on the left...

I found the cause of the non existing temp file. It was my fault, and mistake in the call of meld. (BTW starting the meld through WSL2 in an windows X-Term is pretty much faster than running the windows compilation of meld.)