WUELUG - Würzburg LabVIEW User Group (DE)

cancel
Showing results for 
Search instead for 
Did you mean: 

Set up Fork for GitLab

Solved!
Go to solution

I am also on 1.69.2.0, but unfortunately the call uses slashes and backslashes. No renaming of VIs or classes involved...

 

 

$ C:\Program Files (x86)\National Instruments\Shared\LabVIEW Compare\LVCompare.exe "C:\Labview\hse-db\Source/DB-Engines/DB-SQLite/Init Interface.vi" "C:\Users\admin\AppData\Local\Temp\Fork\staged\Init Interface.vi" -nobdpos -nobdcosm

 

 

 

edit: I was testing without the LVCompare Git Adapter. After I've tried it, I don't see any error message or whatsoever popping up 😕


Proud developer at Hampel Software Engineering where we turn '404 not found' into '200 OK'. Join us on Discord
0 Kudos
Message 11 of 24
(5,317 Views)

It is broken again - short happiness ...
It worked almost two times - until I opened the LabVIEW project again 😣

 

No: it depends on which file I compare. With standalone VIs it is still working but when the VI is part of a class or uses such dependencies it doesn't work.

0 Kudos
Message 12 of 24
(5,312 Views)

If you are using the LVCompare Git Adapter make sure to add this key to the ini file if you are using LabVIEW 32-bit

lvcomparepath="C:\Program Files (x86)\National Instruments\Shared\LabVIEW Compare\LVCompare.exe"

But I still get the error that the filenames are the same. But the source of the adapter is available so it should be easy to check the filenames and rename if necessary.

 

Best Regards,

Stefan

Message 13 of 24
(5,296 Views)

Quick update: Stefan has implemented a PoC in the LabVIEW Compare Adapter for Git which solves these problems and which was successfully tested by Ludwig. Hopefully, Stefan‘s changes will be integrated back into the Adapter sometime in January when Sean, the maintainer of that tool, is back in the office. 




DSH Pragmatic Software Development Workshops (Fab, Steve, Brian and me)
Release Automation Tools for LabVIEW (CI/CD integration with LabVIEW)
HSE Discord Server (Discuss our free and commercial tools and services)
DQMH® (Developer Experience that makes you smile )


Message 14 of 24
(5,179 Views)

Thanks Jörg and Stefan for your help. And thanks Stefan for your quick re-programming of the tool. This makes my everyday work much easier!

0 Kudos
Message 15 of 24
(5,167 Views)
Solution
Accepted by FabiolaDelaCueva

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 Adapter
with 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

Message 16 of 24
(5,157 Views)

For those that want to use a shell script instead of a LabVIEW executable checkout this blog post from @Taggart 
https://blog.sasworkshops.com/latest-version-of-git-broke-lvcompare/

Best Regards,

Stefan

Message 17 of 24
(4,048 Views)

Can you please provide an attachment to the source code for the updated executable?

Steven Dusing
CLA, CTA
0 Kudos
Message 18 of 24
(3,932 Views)

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

Message 19 of 24
(3,916 Views)

Thank you. The updated LVCompare Git Adapter is working fine. I'm adding builds for 16, 18, 19 and 20.

 

Did someone manage to configure Fork to work with the shell script from Sam? The external diff tool needs to be an .exe, right?

 


Proud developer at Hampel Software Engineering where we turn '404 not found' into '200 OK'. Join us on Discord
Message 20 of 24
(3,844 Views)