danielroedl / vsc-meld-diff Goto Github PK

Hello,

Thanks for making this extension!.
I was trying to merge changes from clipboard, and after completing /saving/closing I was hit with the error below:

my specs:

Version: 1.79.2 (user setup)
Commit: 695af097c7bd098fbf017ce3ac85e09bbc5dda06
Date: 2023-06-14T08:57:04.379Z
Electron: 22.5.7
Chromium: 108.0.5359.215
Node.js: 16.17.1
V8: 10.8.168.25-electron.0
OS: Windows_NT x64 10.0.19045

the error is on the next post due to the character limit.

Cheers.

In sidebar (file explorer), we must select one file and choose choose the "select" option, then select another file and choose the "compare" option.

It would be nice to select two files, and then just choose a "compare" option. A single-step process instead of two.

Is there a way this extension can be used when going through a Manual Merge with VS Code Settings Sync?

"Meld diff: compare visible documents" reports that both editor panels are the same. What is opened in external merge app for both sides is: c:\Users\matt\AppData\Roaming\Code\User\sync\settings\preview\settings.json .

If it makes a difference, I'm using WinMerge for my merge tool.

Follow-up to #11.

We have a number of context menu options, and not all need to be shown all the time. It actually adds lots of "noise", because many other extensions also add context menu options. 😄

Select for meld compare

• now: always shown
• instead: should be shown when 0, 1, 2 items already selected

Compare with selected for meld compare

• now: always shown
• instead: should be shown when 1, 2 items already selected

Compare all selected files/folders using meld

• now: shown when at least two items are already selected
• ok

Keep in mind meld does 2 or 3-way merge, so 3 should be upper limit.

It seems that something has changed internally in vscode in part of handling git scm related operations -- so now vscode does send
new type code of value 17.

My setup:

OS:
Edition Windows 11 Pro
Version 22H2
Installed on ‎01.‎04.‎2023
OS build 22621.1778
Experience Windows Feature Experience Pack 1000.22642.1000.0

VS code:
Version: 1.79.0 (user setup)
Commit: b380da4ef1ee00e224a15c1d4d9793e27c2b6302
Date: 2023-06-07T14:26:35.552Z
Electron: 22.5.5
Chromium: 108.0.5359.215
Node.js: 16.17.1
V8: 10.8.168.25-electron.0
OS: Windows_NT x64 10.0.22621

Using meld ext along with win/wsl/remote configs of vscode.

Below is the patch I have crafted asap and tested -- it is working fine and as expected.

diff --git a/src/extension.ts b/src/extension.ts
index 1e42174..b89a927 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -537,6 +537,7 @@ export function activate(context: vscode.ExtensionContext) {
                                break;

                     case 16: // merge conflicts
+                    case 17: // new type of conflict
                                // get content of head version of the selected file
                                runGit(selectedFile, ":2:./", "current", (head, err) => {
                                        if (err) {

when I connect with ssh -X to remote develop server I can run meld
but with remote-ssh extension
and this extension I get this error:

Meld Diff Error: Error running diff command! StdErr: Unable to init server: Could not connect: Connection refused
Unable to init server: Could not connect: Connection refused

(meld:45279): Gtk-CRITICAL **: gtk_icon_theme_get_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed
Traceback (most recent call last):
  File "/usr/bin/meld", line 244, in <module>
    setup_resources()
  File "/usr/bin/meld", line 183, in setup_resources
    Gtk.IconTheme.get_default().append_search_path(icon_dir)
AttributeError: 'NoneType' object has no attribute 'append_search_path'

Visual Studio Code has its own diff editor viewer but it is not as good as Meld (e.g. empty space is added instead of fluid synchronised scrolling). I use the GitLab Workflows extension to review merge requests and it uses the built in Visual Studio Code editor (the files for the diff being viewed are not on disk).

Could you please add a button to the built-in VSCode diff view to open the current diff in Meld?

The Beyond Compare VSCode extension has this feature:

• https://github.com/ScooterSoftware/bcompare-vscode?tab=readme-ov-file#open-beyond-compare-from-diff-editor
• https://github.com/ScooterSoftware/bcompare-vscode/blob/6abe51fe7ae46c1abbcbc830dbb169dab3dad274/package.json#L124
• https://github.com/ScooterSoftware/bcompare-vscode/blob/6abe51fe7ae46c1abbcbc830dbb169dab3dad274/src/extension.ts#L1241
  • Left/right files are saved to a temporary location so external editor can load them.

Hello,

I had been using Meld Diff for quite a while, but after formatting my computer and upgrading my Ubuntu to 20.04, I have been getting a Segmentation Fault error when trying to use Meld to diff two files inside VSCode (using the "Select for Meld compare" feature).

Here is a small video showing the error:

And what shows up in the Developer Tools when I open it:

When I try to use meld command manually in a terminal it works perfectly (as shown in the video as well).

VSCode version is 1.56.0
Meld diff extension version is 1.1.0
Ubuntu version 20.04 (don't know if it matters)

meld is in PATH and output of which meld is /usr/bin/meld

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

meld has a great comparison and three way merge.
Please make it possible to use it for resolving git merge conflicts.

The same diff works fine using the built-in vscode diff tool, or manually using meld.

It does not seem to work properly in Japanese environment.

First of all thank you for this extension!

I have configured BeyondCompare as my diff tool, and it opens just fine - but when I close the BeyondCompare app, or even when closing just one of the compared files inside BC, a VS Code tray notification pops up: "Meld Diff Error: Error running diff command! StdErr:"

Is there any way to suppress that?

I'm trying to set a custom path to meld using "meld-diff.diffCommand". The path I'm using is correct. But meld doesn't find the binary (I assume) because when I try to do a comparison nothing happens.

Is there a log written somewhere that I can check to see what is the error?