Thursday, August 30, 2012

Performing compare in Eclipse with resources that are not under version control

I had an interesting problem at hand. For a particular plugin that has GEF editor every time model of the editor would get build a special '.compiledFlow' file would get generated. This file should not be managed by svn and should not be committed with the rest of the project. This was double by using Team.setAllIgnores(). However, as a by-product of this whenever I tried to compare a file that was under version control, .compiledFlow would also be considered for comparison, this is because model file and .compiledFlow file were bulked in this special virtual folder. Whenever I tried to compare my model file I would get the following error
org.tigris.subversion.javahl.ClientException: svn: '/home/akravets/dev/workspaces/runtime-trunk/test1/Flows/flow1.iwp/.compiledFlow' is not under version control at org.tigris.subversion.svnclientadapter.javahl.AbstractJhlClientAdapter.diff( at org.tigris.subversion.subclipse.ui.operations.ShowDifferencesAsUnifiedDiffOperationWC.execute( at at$ at at$ at org.eclipse.jface.operation.ModalContext$ Caused by: org.tigris.subversion.javahl.ClientException: svn: '/home/akravets/dev/workspaces/runtime-trunk/test1/Flows/flow1.iwp/.compiledFlow' is not under version control at org.tigris.subversion.javahl.JavaHLObjectFactory.throwException( at org.tmatesoft.svn.core.javahl.SVNClientImpl.throwException( at org.tmatesoft.svn.core.javahl.SVNClientImpl.diff( at org.tmatesoft.svn.core.javahl.SVNClientImpl.diff( at org.tmatesoft.svn.core.javahl.SVNClientImpl.diff( at org.tigris.subversion.svnclientadapter.javahl.AbstractJhlClientAdapter.diff( ... 6 more Caused by: org.tmatesoft.svn.core.SVNException: svn: '/home/akravets/dev/workspaces/runtime-trunk/test1/Flows/flow1.iwp/.compiledFlow' is not under version control at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error( at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error( at org.tmatesoft.svn.core.internal.wc.admin.SVNWCAccess.getVersionedEntry( at org.tmatesoft.svn.core.wc.SVNBasicClient.getRevisionNumber( at org.tmatesoft.svn.core.wc.SVNBasicClient.getRevisionNumber( at org.tmatesoft.svn.core.wc.SVNDiffClient.doDiffURLWC( at org.tmatesoft.svn.core.wc.SVNDiffClient.doDiff( at org.tmatesoft.svn.core.javahl.SVNClientImpl.diff( ... 9 more
Obviously the problem here is that .compiledFlow was not under version control. However, I don't want it to be there, and I also want to compare this file's siblings. The solution is set unversioned diff flag:
SVNDiffClient diffClient = SVNClientManager.newInstance().getDiffClient(); 

Monday, August 27, 2012

Meld wrapper script

A script to call meld with comparison of local and remote file:

# if you simply want to see what command arguments are passed by subversion,
# simply uncomment following line, and comment rest of the script:
# echo "$@"


# Configure your favorite diff program here.

# Subversion provides the paths we need as the sixth and seventh
# parameters.
LEFT=${3} # 'MINE' - was 6
RIGHT=${2} # 'THEIRS' (online) - was 7

# Call the diff command (change the following line to make sense for
# your merge program).

# Return an errorcode of 0 if no differences were detected, 1 if some were.
# Any other errorcode will be treated as fatal.

Blogger Syntax Highliter