I'm having some trouble setting up Fork for GitLab right now. Since I know that some of you also use Fork, I'm sure I'll find help here. The link from Fork to the issues in GitLab is already working very well (Issue Tracker in Repository Settings). Thanks to Stefan Lemmens presentation, I also set up a custom command that opens the LabVIEW project directly from Fork. This also works very well. What unfortunately does not work for me at all is the integration of LVCompare: The setup as external diff tool in Fork seems to be no problem. The first problem came up with the representation of paths in GitLab.screenshot of the error message depending on paths representation in GitLabFortunately, I have already found a solution for this here in the community: LVCompare Adapter for GIT Extensions But I still can't compare my LabVIEW files as another error pops up:screenshot of the same-name-error Now I am unfortunately at my wit's end and could use some help. Did someone get this working?

Since it takes very long to get the original example code updated I'll post the modified tool here already. You have to install the LVCompare Adapter for GIT Extensions which can be found here Then replace the exe in the folder C:\Program Files (x86)\National Instruments\LVCompare Git Adapterwith the one from the zipfile in attachment. What this will do is create a renamed copy in the temp folder if both files to compare have the same name. In the past GIT Fork would name the $REMOTE and $LOCAL different before launching the compare.But with the newer version they get the same name because they also want to be able to compare folder structures.But LabVIEW Compare can't handle 2 files with the same name so the only way to workaround was to rename a file. To setup GIT Fork to work with this adapter follow the instructions on the link above. Best Regards, Stefan

WUELUG - Würzburg LabVIEW User Group (DE)

Set up Fork for GitLab

Solved!

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?

Message 21 of 25

(1,720 Views)

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

Message 22 of 25

(1,706 Views)

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.

Message 23 of 25

(1,696 Views)

@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.

--
Tim Elsey
Certified LabVIEW Architect

Message 24 of 25

(1,620 Views)

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.

----------
Although I've been 10+ years long fan of LabVIEW, I started to discourage engineers to start new projects in a SaaS language. NI must first regain trust within its community.