Set up Fork for GitLab

[justACS]

Hi guys!

I'm trying to set this up with Sourcetree.  I can invoke the diff tool, but I get this error:

What am I doing wrong?

[StefanLemmens]

Hi Allen,

how did you configure SourceTree to use the diff tool?
Which arguments did you set?
In GIT Fork we use these : “$LOCAL” “$REMOTE” -nobdpos -nobdcosm
I was the one that wrote the LabVIEW version of the adapter but haven't tested it with SourceTree.

You can also find the source code in a previous post in this thread.

You can also find more info on how to configure the compare in Fab's post :
https://dqmh.org/configuring-hg-or-git-to-use-labview-compare-and-labview-merge/

Let me know if you need any more help.

Best Regards,

Stefan

[justACS]

Hi Stefan,

Thanks for getting back to me.

This is my configuration in Sourcetree:

The diff command path is C:\Program Files (x86)\National Instruments\LVCompare Git Adapter\lvcomparegit.exe.

I'll look at Fab's videos, too.

[elset191]

---

@StefanLemmens wrote:

Here is the source code for the modified version of the LVCompareGitAdapter.

But I still think Sam's shell script is much nicer since it doesn't require a LabVIEW run-time to be installed.

Best Regards,

Stefan

---

Were you able to get Sam's shell script working in Fork?  As @AlexElb noted it seems you can only select *.exe or *.cmd files for the external tools.

[benjamin-hinrichs]

I tried to setup Sam's scripts in fork, but didn't manage. But NI improved the diff and merge tools in LV24 (maybe prior version, too), so that th adapter script isn't needed anymore. 

[JoGra]

Hi, 

Do your LVcompare setups with work still work with Fork?
I'm using LV2023Q3 and Sam's scripts work flawlessly through VS Code (with evaluation wrong, see further below) 

But when trying to setup Fork (version 2.6.1.0) like Benjamin in the previous post, I'm receiving an error from LVCompare: 

I tried intercepting the paths by calling LVCompare through .cmd file

@echo off
echo localOrig %1
echo remoteOrig %2
pause

Which does show some weirdness with the paths from Fork...

Then I tried with the LVCompare Git Adapter_lv20 from Alex. 
Which did work directly and all dependencies are loaded too (the new? arguments like -nobdpos  and -nobdcosm are not passed through, but that can be fixed easily)

Something changed in LVCompare though because the evaluation of changes in the VI is backwards when calling "lvcomparegit.exe "$LOCAL" "$REMOTE". 
It says "added" while it should be "deleted". Pressing "Swap VI Positions" in LVCompare results in the correct evaluation, but its a confusing second step. 

So then maybe we should call lvcompare with swapped inputs - "lvcomparegit.exe  "$REMOTE" "$LOCAL"
The evaluation is correct, but no dependencies are loaded.

Can anyone repeat this behavior?