From Friday, January 17th 11 PM CDT (January 18th 5 AM UTC) through Saturday, January 18th 11:30 AM CDT (January 18th 5:30 PM UTC), ni.com will undergo system upgrades that may result in temporary service interruption.

We appreciate your patience as we improve our online experience.

LabVIEW 2022 Public Beta

cancel
Showing results for 
Search instead for 
Did you mean: 

No Source Code Control for Mac OS?

Looking for improvements in source code control and VI comparison merge.  But in the preferences I only get the option none.  There is git installed on the machine and I use it through SourceTree.  There are some weirdnesses of trying to get git to ignore different line endings in some of the project files....

 

But the only option in the preferences is "none".

sth_1-1655267730104.png

 

LabVIEW ChampionLabVIEW Channel Wires

0 Kudos
Message 1 of 20
(3,645 Views)

Hopefully someone from NI can clarify but my understanding was that the changes aren't to do with the providers in the project but just to make the vicompare etc. easier to call from the command line with git directly.

 

(I think those providers are pretty tied to the idea of a centralised SCM system and I don't ever expect much git support through them, but I'd like to be wrong!)

James Mc
========
CLA and cRIO Fanatic
My writings on LabVIEW Development are at devs.wiresmithtech.com
0 Kudos
Message 2 of 20
(3,604 Views)

James is correct; we've been working on improvements to Compare VIs (aka diff), but we're not planning to integrate git with the LabVIEW editor in the near future. Currently, the only source control provider that LabVIEW integrates into the editor on non-Windows platforms is Perforce.


Christina Rogers
Principal Product Owner, LabVIEW R&D
0 Kudos
Message 3 of 20
(3,575 Views)

@Christina_R wrote:

Currently, the only source control provider that LabVIEW integrates into the editor on non-Windows platforms is Perforce.


That was the missing piece of information.  I was assuming that you would support git as one of the most prevalent SCC systems.  Or even hg.  But Perforce is a more commercial (and expensive) system and I did not know that it is beginning to support other platforms and maybe should look into it.

 

Would it be that difficult to integrate the git as a SCC API?  I would think it easier than Perforce with all the overhead instead of the relatively simple git calls.  But YMMV.

LabVIEW ChampionLabVIEW Channel Wires

0 Kudos
Message 4 of 20
(3,568 Views)

@sth wrote:

@Christina_R wrote:

Currently, the only source control provider that LabVIEW integrates into the editor on non-Windows platforms is Perforce.


That was the missing piece of information.  I was assuming that you would support git as one of the most prevalent SCC systems.  Or even hg.  But Perforce is a more commercial (and expensive) system and I did not know that it is beginning to support other platforms and maybe should look into it.

 

Would it be that difficult to integrate the git as a SCC API?  I would think it easier than Perforce with all the overhead instead of the relatively simple git calls.  But YMMV.


The Perforce integration has been in LabVIEW for a VERY long time.  From my understanding, NI was using Perforce.  Therefore they were more inclined to have built-in support for Perforce.

 

Looking at the options for configuring source control options (in 2021 and 8.2), I'm actually a little surprised to see Surround SCM in the supported tools, which we use here for project documents.


GCentral
There are only two ways to tell somebody thanks: Kudos and Marked Solutions
Unofficial Forum Rules and Guidelines
"Not that we are sufficient in ourselves to claim anything as coming from us, but our sufficiency is from God" - 2 Corinthians 3:5
0 Kudos
Message 5 of 20
(3,558 Views)

I wonder how much glue is needed to stick in support for more common SCC systems such as git (hg, svn etc.).  Here is a good project for G-Central to farm out to enterprising coders.  (or a summer intern project at NI?)

 

I would really like a good SCC and have ignored this for too long.  I mostly worked alone for many years.  About 2 years ago, I started putting new projects on a git server and collaborating/archiving code for others.  I will continue to use SourceTree as my GUI for git but I always wondered what the advantage of using an internal SCM within LV was.  Hopefully the new integration with Compare/Merge??  Maybe there isn't much advantage to that internal SCM.