By Francois Normandin
As I've reported in the UI Tools support page, I've started migrating the open source code I still have on bitbucket (Mercurial-based repos) to Github.
I didn't think that it might be worth a specific topic until @LogMAN mentioned it. Personally, I'm moving my code to Github in the process. I know there are some reports of Hg-to-Git transitions not going so well when using sub-repositories, so please share your migration experience if you've had to jump into some hoops to get it done!
For all of you who still use Mercurial and host your open source and/or enterprise repos on Bitbucket, this blog post is worth reading:
I use SVN for version control in my project and am often faced with many conflicted VIs that must be dealt with. I have found that frequently, the changes causing these conflicts are not "real" changes (for example, a wire was moved or a typedef for a cluster control was changed). So, I am trying to create a tool that queries my project directory for any VIs that have conflicts, and running the VI Comparison tool with only non-cosmetic changes enabled to automatically find VIs that don't have any "real" changes and marked the conflicts as resolved. I would like to build the tool into a .exe because I would like to be able to run this tool from the command-line so that I can create a right-click menu item in my Windows environment to easily run the tool from any folder containing conflicted files.
I found vi.lib\SourceControl\support\SCCSup Compare Two VIs.vi which performs the comparison operation, allows me to specify which types of changes to detect, and returns if there are differences. This is exactly what I need and it works perfectly in the development environment. However, when I build my tool to a .exe file, I get a LabVIEW error with the following description:
Error 1574 occurred at Open VI Reference in SCCSup Compare Two VIs.vi->Resolve False Conflicts.vi Possible reason(s): LabVIEW: (Hex 0x626) Cannot open a file with separated compiled code in the LabVIEW Run-Time Engine. An error occurred loading VI 'my.vi'. LabVIEW load error code 59: The source file's compiled code has been separated, and this version of LabVIEW does not have access to separated Where my.vi is the path to the VI that it is attempting to compare. All of the VIs in my project have "Separate compiled code" enabled since I use version control on them, therefore turning it off it not an option. Is there any way to get around this issue?
Recently I moved from SVN to GIT as my source control and revision manager. I'm still getting used to everything so i don't consider myself an expert yet, but i really missed the Project Provider options that I used for SVN source control within the project window.
I'm releasing an open source beta project provider for TortoiseGit Integration. This addon is very similar to the current SVN options but was developed entirely from scratch. Currently this provider requires TortoiseGit to perform most of the Source Control Actions. I know a lot of you on here have recently switched to sourcetree, however, unlike TortoiseGit they do not currently offer a command line interface yet for windows that i could find. I've tried to make this project flexibile and if they offer a command line for windows eventually it should be fairly quick to re-factor for that.
The project can be found here: https://bitbucket.org/jed_d/lv_tortoisegit
Tortoise Git Icon Overlays within Labview IDE Tortoise Git Commands from within Labview IDE Ability to directly reload a project from within the Project Window, as well as prompts to reload the project when performing actions that require a reload. Open Git Bash from project window
I'm hoping some of you will have a chance to try this out and let me know of any issues. I would like to track issues on bitbucket if possible so that they are all in one place, but i will also be checking these post for issues as well.
Feel free to fork the project and hack on it yourself. If you come up with something decent and don't mind sharing, send a pull request.
One initial issues i'm hoping the community can help with is building the package for older versions of LV. Currently i only have access to 2013 so i am only able to build the package for this version. If anyone has a change to pull down the repo and build it for older versions please do.
Another question i have for the community is the license i currently have on the project. This is my first open source project of any kind so i wasn't sure what license to put on it. I did not want to be too restrictive so i went with a BSD license. If any of you see an issue with this please let me know as I'm open to suggestions.
I am getting started with using TFS for source code control with LabVIEW. I am using TFS 2013 and LabVIEW 2013.
I have a few questions:
What is the best way to move files from one project folder to another? The "move on disk" doesn't appear to be a good option. I want to be able to make file moves if needed and don't want my project to end up blowing up with conflicts.
It appears that once source control is set up in LabVIEW that all check in/check out operations need to happen in LabVIEW and not TFS or windows explorer. Correct?
I just noticed the "Include callers when checking out files" option. I am assuming that is probably a good option to select so that they callers will be modified and saved as needed.
Does having files set up as auto populating have any negative effects on how source control is done?
Unfortunately it appears that we are stuck using TFS for source control since the firmware developers are using it and it is a company application now.
Any help or guidance you can provide would be appreciated.
Here is the set-up:
I have a component project library (StepperMotor.lvlib) that I have moved to the userlib in order to facilitate reuse over multiple projects. Within the library I have
1) a strict typedef (StepperMotor.ctl) cluster that contains a numeric control for expressing the maximum output step rate.
2) the StepperMotor.lvclass, an abstract class that contains effectively virtual methods (they do nothing but wire inputs to outputs) and LabVIEW-generated accessor methods for the two items in the class private data.
This is LabVIEW 2013 SP1 on Windows 8.1.
OK, so I start with everything clean (git status reports clean, LabVIEW opens and closes the library without prompting for changes).
1) Then I open the StepperMotor.ctl directly from Windows Explorer (hence not opening the library), change the range of the numeric from 2 kHz to 4 kHz, and save it.
2) Then I open the library, make no further changes, and attempt to close the library. LabVIEW correctly prompts me to save changes. I opt to close the project without saving changes, however.
3) Next I discard the change to StepperMotor.ctl using git. (I have been using Discard in SourceTree, or a git reset --hard command.) Then git status returns a clean status.
4) I open the project and attempt to close it. Since I have reverted all changes, LabVIEW does not prompt to save changes.
So far, so good. This is expected behavior.
Now, I repeat the steps, except that in step
1) I open the library first, open the typedef control from the project, make the same change, save the control (without applying the changes), and close the project (without saving).
2) is the same as above (OK).
3) is the same as above. Again, git status shows me everything is clean.
4) I perform the same action as above, but this time LabVIEW prompts me to save all the accessor methods on the class, citing a changed typedef (even though if I open the typedef the range is indeed back to its original value). This is unexpected behavior.
Worse yet, even if I perform a git reset --hard and verify with a git status that everything is clean, if I open and immediately attempt to close the project, LabVIEW still prompts to save, citing "Type Definition modified". This is indeed problematic.
(Further note: If I let LabVIEW save the changes, git status still shows clean, and LabVIEW opens and closes the project without prompts.)