LabVIEW Wiki - User contributions [en]

Subversion

2010-01-06T18:47:38Z

68omalley: /* External links */ Changed to see also, added internal link to differencing

[http://subversion.tigris.org/ Subversion] is an open source SCC tool.

{{TOCright}}

== Subversion access ==

Subversion is accessible inside the OS with several tools: [[TortoiseSVN client to Subversion]] 

 

== Subversion hosting ==

There are several online subversion hosting providers. A list is available at [http://www.svnhostingcomparison.com/ SVN hosting comparison]. [http://www.sliksvn.com Slik] offers a free plan for 10 MB based in the Netherlands and focuses on Europe.

It is also easy to set up your own subversion server using [http://help.ubuntu.com/community/Subversion WebDAV in Apache on Ubuntu]
 

== Using Windows explorer with Subversion ==

Tortoise SVN stores subversion status as a property on files on Windows OS's, these can be accesed via the file properties: 

[[Image:WinSVNProperties.png|frame|center|Properties of an SVN file]]The details view of any explorer window can show these properties as well: 

#Right click the column header, chose ''More...'' 
#Scroll down untill the values start with SVN 
#Pick the values you like, I prefer, Revision, Status and Author 
#Now the details view shows direct info on the actual status of the file: 
#Optionally one can remove the Icon overlay sets from Tortoise SVN. 

[[Image:WinSVNDetails.png|frame|center|SVN Details on Windows]] 

 

== Using Total Commander with Subversion ==

[http://www.totalcommander.com Total Commander] is a file browser for Windows based on the DOS Norton commander (dual pane). 

To retrieve info on the SVN status of files you can use custom columns. To use this technique you need the [http://www.ghisler.com/plugins.htm#filesys Shelldetails] extension 

#Go to Configuraton ->Display -> Configure custom columns
#Duplicate the current setup and name is SVN.
#Add a column, set the caption and width
#Click on the '+' sign on the right hand side of the column
#Select 'Shelldetails' and the appropriate SVN properties.
#To activate this VIEW, select <Shift+F1>, a little pop-up will give you the option to select the view you need (SVN)
#In the full-view you have now info on the SVN properties and possibilities to sort the folder contents based on the SVN status

[[Image:TCMDSVNDetails.png|frame|center|SVN details in Total Commander]]

== See also ==
[[Set up differencing capabilities]] 
[[User:Jim kring|Jim Kring's]] blog [http://www.thinkinging.com Thinking in G] has a [http://thinkinging.com/category/tortoisesvn/ category on TortoiseSVN] with additional thoughts, howto's and tricks.

[[Category:SCC]]
[[Category:SVN]]

Subversion

2009-08-31T12:16:09Z

68omalley: /* Subversion hosting */ add set up your own server

[http://subversion.tigris.org/ Subversion] is an open source SCC tool.

{{TOCright}}

== Subversion access ==

Subversion is accessible inside the OS with several tools: [[TortoiseSVN client to Subversion]] 

 

== Subversion hosting ==

There are several online subversion hosting providers. A list is available at [http://www.svnhostingcomparison.com/ SVN hosting comparison]. [http://www.sliksvn.com Slik] offers a free plan for 10 MB based in the Netherlands and focuses on Europe.

It is also easy to set up your own subversion server using [http://help.ubuntu.com/community/Subversion WebDAV in Apache on Ubuntu]
 

== Using Windows explorer with Subversion ==

Tortoise SVN stores subversion status as a property on files on Windows OS's, these can be accesed via the file properties: 

[[Image:WinSVNProperties.png|frame|center|Properties of an SVN file]]The details view of any explorer window can show these properties as well: 

#Right click the column header, chose ''More...'' 
#Scroll down untill the values start with SVN 
#Pick the values you like, I prefer, Revision, Status and Author 
#Now the details view shows direct info on the actual status of the file: 
#Optionally one can remove the Icon overlay sets from Tortoise SVN. 

[[Image:WinSVNDetails.png|frame|center|SVN Details on Windows]] 

 

== Using Total Commander with Subversion ==

[http://www.totalcommander.com Total Commander] is a file browser for Windows based on the DOS Norton commander (dual pane). 

To retrieve info on the SVN status of files you can use custom columns. To use this technique you need the [http://www.ghisler.com/plugins.htm#filesys Shelldetails] extension 

#Go to Configuraton ->Display -> Configure custom columns
#Duplicate the current setup and name is SVN.
#Add a column, set the caption and width
#Click on the '+' sign on the right hand side of the column
#Select 'Shelldetails' and the appropriate SVN properties.
#To activate this VIEW, select <Shift+F1>, a little pop-up will give you the option to select the view you need (SVN)
#In the full-view you have now info on the SVN properties and possibilities to sort the folder contents based on the SVN status

[[Image:TCMDSVNDetails.png|frame|center|SVN details in Total Commander]]

== External links ==
[[User:Jim kring|Jim Kring's]] blog [http://www.thinkinging.com Thinking in G] has a [http://thinkinging.com/category/tortoisesvn/ category on TortoiseSVN] with additional thoughts, howto's and tricks.

[[Category:SCC]]
[[Category:SVN]]

Help talk:Formatting

2009-08-28T20:53:34Z

68omalley:

Is there a syntax highlighting extension?

Not sure of which extension you are looking for. If you can find one then I'd be glad to add it. --[[User:MichaelAivaliotis|MichaelAivaliotis]] 20:34, 28 August 2009 (UTC)

I use this on my wiki, seems to work well http://www.mediawiki.org/wiki/Extension:SyntaxHighlight_GeSHi

Set up differencing capabilities

2009-08-28T16:33:24Z

68omalley: Added a description for how to use LVCompare.exe with subversion. Reorder article for clarity

There are several methods setting up differencing LabVIEW VIs with subversion. A new feature in LabVIEW 2009 in the program LVCompare.exe which allows graphical differencing from the command line. In older versions, TortoiseSVN can be coupled with the open source LVDiff to achieve the same goal.
== Using LVCompare.exe and svn CLI ==
From the command line, subversion cannot normally compare binary files such as vis. The svn diff command has a switch --diff-cmd to allow an external differencing engine to be used. This will be leveraged to used LVComare to operate on vis.

To use LVCompare.exe with subversion in the command line, first add "C:\Program Files\National Instruments\Shared\LabVIEW Compare" to your system PATH variable (this allows the command prompt to find LVcompare.exe).

The output of the diff command is quite complicated (from [http://subversion.tigris.org/faq.html#diff-cmd] subversion FAQ):
<blockquote>When using an external diff command, Subversion builds a fairly complicated command line. First is the specified --diff-cmd. Next comes the specified --extensions (although empty --extensions are ignored), or '-u' if --extensions is unspecified (or specified as ''). Third and fourth, Subversion passes a '-L' and the first file's label (e.g. "project_issues.html (revision 11209)"). Fifth and sixth are another '-L' and the second label. Seventh and eighth are the first and second file names (e.g. ".svn/text-base/project_issues.html.svn-base" and ".svn/tmp/project_issues.html.tmp").
 
If your preferred diff command does not support these arguments, you may need to create a small wrapper script to discard arguments and just use the last couple file paths.
 
Warning: Beware that Subversion does not expect the external diff program to change the files it receives, and doing so may scramble the working copy.
</blockquote>
On windows, this wrapper is easy to create. Save the following file as LVdiff.bat in the same directory as LVCompare.exe. This formulates the LVCompare command correctly.
<blockquote>
@ECHO OFF 
lvcompare "%cd%\%~7" "%cd%\%~6"
</blockquote>
Then, to execute the diff, use the following command:
<blockquote>
svn diff --diff-cmd LVdiff.bat --force CHANGED.vi
</blockquote>
where CHANGED.vi is the one you want to diff.

IMPORTANT: As stated in the FAQ, subversion does not expect diff to make any changes, so make sure not to save the text-base vi.

== Using TortoiseSVN and LVDiff for VIs ==
TortoiseSVN has its own program (TortoiseMerge) to show the differences between two different versions of a file. This works well with text files but since LabVIEW VIs are binary files it is advantageous to use LabVIEW's graphical differencing capabilities.

The professional version of LabVIEW has a "CMP Compare two VIs.vi" in the ...\LabVIEW x.x\project\procmphier.llb library.

The open-source "LVDiff" tool (see [http://meta-diff.sourceforge.net/] for the main download but download the updated "lvdiff.vi" from the link here [http://forums.ni.com/ni/board/message?board.id=170&message.id=354286&requireLogin=False] since the version currently in the .zip file does not work with VIs in libraries) provides a wrapper to call this VI.

Be sure to update the paths in the .lvdiff file.

Open Windows Explorer. 
Right-click on a directory and select "TortoiseSVN...Settings" from the pop-up menu. 
Under "External Programs" select "Diff Viewer". 
[IMG]http://i280.photobucket.com/albums/kk176/pauljlotz/DiffViewerPageNew2.png[/IMG] 
Click on the "Advanced..." button and add a ".vi" extension with the "External Program" pointing to "lvdiff.exe". 
[IMG]http://i280.photobucket.com/albums/kk176/pauljlotz/SettingUpLVDiff.png[/IMG] 

To compare a file with the previous version in the repository right-click on the file in Windows explorer and select "TortoiseSVN...Diff with previous version".

[[Category:SCC]]
[[Category:SVN]]

Help talk:Formatting

2009-08-28T16:17:42Z

68omalley: New page: Is there a syntax highlighting extension?

Is there a syntax highlighting extension?