Package org.tmatesoft.svn.core.internal.wc2.ng

Class SvnNgMergeCallback

java.lang.Object

org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMergeCallback

All Implemented Interfaces:

ISvnDiffCallback

public class SvnNgMergeCallback
extends Object
implements ISvnDiffCallback

Field Summary

Fields

Modifier and Type	Field	Description
private Collection<File>	conflictedPaths
private SvnNgMergeDriver	driver

Constructor Summary

Constructors

Constructor	Description
SvnNgMergeCallback(SvnNgMergeDriver driver)

Method Summary

Modifier and Type	Method	Description
private void	addPathWithAddedMergeInfo(File localAbsPath)
private void	addPathWithDeletedMergeInfo(File localAbsPath)
private boolean	areSourcesAncestral()
private void	checkReposMatch(File path, SVNURL url)
private boolean	compareFiles(File oldPath, SVNProperties oldProps, File minePath)
private boolean	compareProps(SVNProperties p1, SVNProperties p2)
void	dirAdded(SvnDiffCallbackResult result, File path, long revision, String copyFromPath, long copyFromRevision)
void	dirClosed(SvnDiffCallbackResult result, File path, boolean isAdded)
void	dirDeleted(SvnDiffCallbackResult result, File path)
void	dirOpened(SvnDiffCallbackResult result, File path, long revision)
void	dirPropsChanged(SvnDiffCallbackResult result, File path, boolean isAdded, SVNProperties propChanges, SVNProperties originalProperties)
void	fileAdded(SvnDiffCallbackResult result, File path, File leftFile, File rightFile, long rev1, long rev2, String mimeType1, String mimeType2, File copyFromPath, long copyFromRevision, SVNProperties propChanges, SVNProperties originalProperties)
void	fileChanged(SvnDiffCallbackResult result, File path, File tmpFile1, File tmpFile2, long rev1, long rev2, String mimetype1, String mimeType2, SVNProperties propChanges, SVNProperties originalProperties)
void	fileDeleted(SvnDiffCallbackResult result, File path, File leftFile, File rightFile, String mimeType1, String mimeType2, SVNProperties originalProperties)
void	fileOpened(SvnDiffCallbackResult result, File path, long revision)
private SVNProperties	filterSelfReferentialMergeInfo(SVNProperties props, File localAbsPath, boolean honorMergeInfo, boolean sameRepos, boolean reintegrateMerge, SVNRepository repos)
private File	getAddedPath()
Collection<File>	getConflictedPaths()
private SVNWCContext	getContext()
private SVNDiffOptions	getDiffOptions()
private Collection<File>	getDryRunAdditions()
private Collection<File>	getDryRunDeletions()
private SVNRepository	getRepos1()
private SVNRepository	getRepos2()
private SvnRepositoryAccess	getRepositoryAccess()
private SVNURL	getReposRootURL()
private long	getSource1Rev()
private SVNURL	getSource1URL()
private long	getSource2Rev()
private SVNURL	getSource2URL()
private File	getTargetPath()
private boolean	isDryRun()
private boolean	isForce()
private boolean	isHonorMergeInfo()
private boolean	isRecordOnly()
private boolean	isReintegrateMerge()
private boolean	isSameRepos()
private SVNConflictVersion[]	makeConflictVersions(File target, SVNNodeKind kind)
private SVNTreeConflictDescription	makeTreeConflict(File path, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason)
private SVNWCContext.MergePropertiesInfo	mergePropChanges(File localAbsPath, SVNProperties propChanges, SVNProperties originalProperties)
protected static SVNProperties	omitMergeInfoChanges(SVNProperties props)
private void	setAddedPath(File path)
private void	setDryRunAddtions(Collection<File> set)
private void	setDryRunDeletions(Collection<File> set)
private Map<String,SVNMergeRangeList>[]	splitMergeInfoOnRevision(Map<String,SVNMergeRangeList> mergeinfo, long revision)
private void	treeConflict(File path, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason)
private void	treeConflictOnAdd(File path, SVNNodeKind kind, SVNConflictAction action, SVNConflictReason reason)

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Field Details

conflictedPaths

private Collection<File> conflictedPaths

driver

private SvnNgMergeDriver driver

Constructor Details

SvnNgMergeCallback

public SvnNgMergeCallback(SvnNgMergeDriver driver)

Method Details

getConflictedPaths

public Collection<File> getConflictedPaths()

fileOpened

public void fileOpened(SvnDiffCallbackResult result,
 File path,
 long revision)
                throws SVNException

Specified by:

fileOpened in interface ISvnDiffCallback

Throws:

SVNException

fileChanged

public void fileChanged(SvnDiffCallbackResult result,
 File path,
 File tmpFile1,
 File tmpFile2,
 long rev1,
 long rev2,
 String mimetype1,
 String mimeType2,
 SVNProperties propChanges,
 SVNProperties originalProperties)
                 throws SVNException

Specified by:

fileChanged in interface ISvnDiffCallback

Throws:

SVNException

fileAdded

public void fileAdded(SvnDiffCallbackResult result,
 File path,
 File leftFile,
 File rightFile,
 long rev1,
 long rev2,
 String mimeType1,
 String mimeType2,
 File copyFromPath,
 long copyFromRevision,
 SVNProperties propChanges,
 SVNProperties originalProperties)
               throws SVNException

Specified by:

fileAdded in interface ISvnDiffCallback

Throws:

SVNException

fileDeleted

public void fileDeleted(SvnDiffCallbackResult result,
 File path,
 File leftFile,
 File rightFile,
 String mimeType1,
 String mimeType2,
 SVNProperties originalProperties)
                 throws SVNException

Specified by:

fileDeleted in interface ISvnDiffCallback

Throws:

SVNException

setDryRunDeletions

private void setDryRunDeletions(Collection<File> set)

setDryRunAddtions

private void setDryRunAddtions(Collection<File> set)

dirDeleted

public void dirDeleted(SvnDiffCallbackResult result,
 File path)
                throws SVNException

Specified by:

dirDeleted in interface ISvnDiffCallback

Throws:

SVNException

dirOpened

public void dirOpened(SvnDiffCallbackResult result,
 File path,
 long revision)
               throws SVNException

Specified by:

dirOpened in interface ISvnDiffCallback

Throws:

SVNException

dirAdded

public void dirAdded(SvnDiffCallbackResult result,
 File path,
 long revision,
 String copyFromPath,
 long copyFromRevision)
              throws SVNException

Specified by:

dirAdded in interface ISvnDiffCallback

Throws:

SVNException

dirPropsChanged

public void dirPropsChanged(SvnDiffCallbackResult result,
 File path,
 boolean isAdded,
 SVNProperties propChanges,
 SVNProperties originalProperties)
                     throws SVNException

Specified by:

dirPropsChanged in interface ISvnDiffCallback

Throws:

SVNException

dirClosed

public void dirClosed(SvnDiffCallbackResult result,
 File path,
 boolean isAdded)
               throws SVNException

Specified by:

dirClosed in interface ISvnDiffCallback

Throws:

SVNException

checkReposMatch

private void checkReposMatch(File path,
 SVNURL url)
                      throws SVNException

Throws:

SVNException

mergePropChanges

private SVNWCContext.MergePropertiesInfo mergePropChanges(File localAbsPath,
 SVNProperties propChanges,
 SVNProperties originalProperties)
                                                   throws SVNException

Throws:

SVNException

addPathWithAddedMergeInfo

private void addPathWithAddedMergeInfo(File localAbsPath)

addPathWithDeletedMergeInfo

private void addPathWithDeletedMergeInfo(File localAbsPath)

filterSelfReferentialMergeInfo

private SVNProperties filterSelfReferentialMergeInfo(SVNProperties props,
 File localAbsPath,
 boolean honorMergeInfo,
 boolean sameRepos,
 boolean reintegrateMerge,
 SVNRepository repos)
                                              throws SVNException

Throws:

SVNException

splitMergeInfoOnRevision

private Map<String,SVNMergeRangeList>[] splitMergeInfoOnRevision(Map<String,SVNMergeRangeList> mergeinfo,
 long revision)

omitMergeInfoChanges

protected static SVNProperties omitMergeInfoChanges(SVNProperties props)

isHonorMergeInfo

private boolean isHonorMergeInfo()

makeConflictVersions

private SVNConflictVersion[] makeConflictVersions(File target,
 SVNNodeKind kind)
                                           throws SVNException

Throws:

SVNException

treeConflictOnAdd

private void treeConflictOnAdd(File path,
 SVNNodeKind kind,
 SVNConflictAction action,
 SVNConflictReason reason)
                        throws SVNException

Throws:

SVNException

makeTreeConflict

private SVNTreeConflictDescription makeTreeConflict(File path,
 SVNNodeKind kind,
 SVNConflictAction action,
 SVNConflictReason reason)
                                             throws SVNException

Throws:

SVNException

treeConflict

private void treeConflict(File path,
 SVNNodeKind kind,
 SVNConflictAction action,
 SVNConflictReason reason)
                   throws SVNException

Throws:

SVNException

compareProps

private boolean compareProps(SVNProperties p1,
 SVNProperties p2)
                      throws SVNException

Throws:

SVNException

compareFiles

private boolean compareFiles(File oldPath,
 SVNProperties oldProps,
 File minePath)
                      throws SVNException

Throws:

SVNException

getContext

private SVNWCContext getContext()

isReintegrateMerge

private boolean isReintegrateMerge()

isRecordOnly

private boolean isRecordOnly()

isDryRun

private boolean isDryRun()

isForce

private boolean isForce()

isSameRepos

private boolean isSameRepos()

getDiffOptions

private SVNDiffOptions getDiffOptions()

getAddedPath

private File getAddedPath()

setAddedPath

private void setAddedPath(File path)

areSourcesAncestral

private boolean areSourcesAncestral()

getTargetPath

private File getTargetPath()

getRepos1

private SVNRepository getRepos1()

getRepos2

private SVNRepository getRepos2()

getReposRootURL

private SVNURL getReposRootURL()

getRepositoryAccess

private SvnRepositoryAccess getRepositoryAccess()

getSource1URL

private SVNURL getSource1URL()

getSource2URL

private SVNURL getSource2URL()

getSource1Rev

private long getSource1Rev()

getSource2Rev

private long getSource2Rev()

getDryRunDeletions

private Collection<File> getDryRunDeletions()

getDryRunAdditions

private Collection<File> getDryRunAdditions()