Class SVNTreeConflictEditor
- java.lang.Object
-
- org.tmatesoft.svn.core.internal.wc17.SVNTreeConflictEditor
-
- All Implemented Interfaces:
ISVNEditor2
public class SVNTreeConflictEditor extends java.lang.Object implements ISVNEditor2
-
-
Nested Class Summary
Nested Classes Modifier and Type Class Description private static class
SVNTreeConflictEditor.UpdateWorkingProps
private static class
SVNTreeConflictEditor.WorkingNodeVersion
-
Field Summary
Fields Modifier and Type Field Description private java.io.File
conflictRootRelPath
private SVNWCDb
db
private ISVNEventHandler
eventHandler
private java.io.File
moveRootDstRelPath
private SVNConflictVersion
newVersion
private SVNConflictVersion
oldVersion
private SVNOperation
operation
private SVNWCDbRoot
wcRoot
-
Constructor Summary
Constructors Constructor Description SVNTreeConflictEditor(SVNWCDb db, SVNOperation operation, SVNConflictVersion oldVersion, SVNConflictVersion newVersion, SVNWCDbRoot wcRoot, java.io.File moveRootDstRelPath)
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description void
abort()
void
addAbsent(java.lang.String path, SVNNodeKind kind, long replacesRev)
void
addDir(java.lang.String path, java.util.List<java.lang.String> children, SVNProperties props, long replacesRev)
void
addFile(java.lang.String path, SvnChecksum checksum, java.io.InputStream contents, SVNProperties props, long replacesRev)
void
addSymlink(java.lang.String path, java.lang.String target, SVNProperties props, long replacesRev)
void
alterDir(java.lang.String path, long revision, java.util.List<java.lang.String> children, SVNProperties props)
void
alterFile(java.lang.String path, long expectedMoveDstRevision, SVNProperties newProps, SvnChecksum newChecksum, java.io.InputStream newContents)
void
alterSymlink(java.lang.String path, long revision, SVNProperties props, java.lang.String target)
private boolean
checkTreeConflict(java.io.File localRelPath, SVNNodeKind oldKind, SVNNodeKind newKind, java.io.File oldReposRelPath, SVNConflictAction action)
void
complete()
void
copy(java.lang.String srcPath, long srcRevision, java.lang.String dstPath, long replacesRev)
private SVNSkel
createConflictMarkers(java.io.File localAbsPath, java.io.File reposRelPath, SVNSkel conflictSkel, SVNOperation operation, SVNTreeConflictEditor.WorkingNodeVersion oldNodeVersion, SVNTreeConflictEditor.WorkingNodeVersion newNodeVersion, SVNNodeKind kind)
void
delete(java.lang.String path, long revision)
private void
markTreeConflict(java.io.File localRelPath, SVNConflictVersion oldVersion, SVNConflictVersion newVersion, java.io.File moveRootDstRelPath, SVNOperation operation, SVNNodeKind oldKind, SVNNodeKind newKind, java.io.File oldReposRelPath, SVNConflictReason reason, SVNConflictAction action, java.io.File moveSrcOpRootRelPath)
void
move(java.lang.String srcPath, long srcRevision, java.lang.String dstPath, long replacesRev)
void
rotate(java.util.List<java.lang.String> relPaths, java.util.List<java.lang.String> revisions)
private void
updateWorkingFile(java.io.File localRelPath, java.io.File reposRelPath, SVNOperation operation, SVNTreeConflictEditor.WorkingNodeVersion oldNodeVersion, SVNTreeConflictEditor.WorkingNodeVersion newNodeVersion)
private SVNTreeConflictEditor.UpdateWorkingProps
updateWorkingProps(SVNSkel conflictSkel, java.io.File localAbsPath, SVNTreeConflictEditor.WorkingNodeVersion oldNodeVersion, SVNTreeConflictEditor.WorkingNodeVersion newNodeVersion)
-
-
-
Field Detail
-
operation
private final SVNOperation operation
-
oldVersion
private final SVNConflictVersion oldVersion
-
newVersion
private final SVNConflictVersion newVersion
-
db
private final SVNWCDb db
-
wcRoot
private final SVNWCDbRoot wcRoot
-
moveRootDstRelPath
private final java.io.File moveRootDstRelPath
-
eventHandler
private ISVNEventHandler eventHandler
-
conflictRootRelPath
private java.io.File conflictRootRelPath
-
-
Constructor Detail
-
SVNTreeConflictEditor
public SVNTreeConflictEditor(SVNWCDb db, SVNOperation operation, SVNConflictVersion oldVersion, SVNConflictVersion newVersion, SVNWCDbRoot wcRoot, java.io.File moveRootDstRelPath)
-
-
Method Detail
-
addDir
public void addDir(java.lang.String path, java.util.List<java.lang.String> children, SVNProperties props, long replacesRev) throws SVNException
- Specified by:
addDir
in interfaceISVNEditor2
- Throws:
SVNException
-
addFile
public void addFile(java.lang.String path, SvnChecksum checksum, java.io.InputStream contents, SVNProperties props, long replacesRev) throws SVNException
- Specified by:
addFile
in interfaceISVNEditor2
- Throws:
SVNException
-
addSymlink
public void addSymlink(java.lang.String path, java.lang.String target, SVNProperties props, long replacesRev) throws SVNException
- Specified by:
addSymlink
in interfaceISVNEditor2
- Throws:
SVNException
-
addAbsent
public void addAbsent(java.lang.String path, SVNNodeKind kind, long replacesRev) throws SVNException
- Specified by:
addAbsent
in interfaceISVNEditor2
- Throws:
SVNException
-
alterDir
public void alterDir(java.lang.String path, long revision, java.util.List<java.lang.String> children, SVNProperties props) throws SVNException
- Specified by:
alterDir
in interfaceISVNEditor2
- Throws:
SVNException
-
alterFile
public void alterFile(java.lang.String path, long expectedMoveDstRevision, SVNProperties newProps, SvnChecksum newChecksum, java.io.InputStream newContents) throws SVNException
- Specified by:
alterFile
in interfaceISVNEditor2
- Throws:
SVNException
-
alterSymlink
public void alterSymlink(java.lang.String path, long revision, SVNProperties props, java.lang.String target) throws SVNException
- Specified by:
alterSymlink
in interfaceISVNEditor2
- Throws:
SVNException
-
delete
public void delete(java.lang.String path, long revision) throws SVNException
- Specified by:
delete
in interfaceISVNEditor2
- Throws:
SVNException
-
copy
public void copy(java.lang.String srcPath, long srcRevision, java.lang.String dstPath, long replacesRev) throws SVNException
- Specified by:
copy
in interfaceISVNEditor2
- Throws:
SVNException
-
move
public void move(java.lang.String srcPath, long srcRevision, java.lang.String dstPath, long replacesRev) throws SVNException
- Specified by:
move
in interfaceISVNEditor2
- Throws:
SVNException
-
rotate
public void rotate(java.util.List<java.lang.String> relPaths, java.util.List<java.lang.String> revisions) throws SVNException
- Specified by:
rotate
in interfaceISVNEditor2
- Throws:
SVNException
-
complete
public void complete()
- Specified by:
complete
in interfaceISVNEditor2
-
abort
public void abort()
- Specified by:
abort
in interfaceISVNEditor2
-
checkTreeConflict
private boolean checkTreeConflict(java.io.File localRelPath, SVNNodeKind oldKind, SVNNodeKind newKind, java.io.File oldReposRelPath, SVNConflictAction action) throws SVNException
- Throws:
SVNException
-
updateWorkingProps
private SVNTreeConflictEditor.UpdateWorkingProps updateWorkingProps(SVNSkel conflictSkel, java.io.File localAbsPath, SVNTreeConflictEditor.WorkingNodeVersion oldNodeVersion, SVNTreeConflictEditor.WorkingNodeVersion newNodeVersion) throws SVNException
- Throws:
SVNException
-
createConflictMarkers
private SVNSkel createConflictMarkers(java.io.File localAbsPath, java.io.File reposRelPath, SVNSkel conflictSkel, SVNOperation operation, SVNTreeConflictEditor.WorkingNodeVersion oldNodeVersion, SVNTreeConflictEditor.WorkingNodeVersion newNodeVersion, SVNNodeKind kind) throws SVNException
- Throws:
SVNException
-
updateWorkingFile
private void updateWorkingFile(java.io.File localRelPath, java.io.File reposRelPath, SVNOperation operation, SVNTreeConflictEditor.WorkingNodeVersion oldNodeVersion, SVNTreeConflictEditor.WorkingNodeVersion newNodeVersion) throws SVNException
- Throws:
SVNException
-
markTreeConflict
private void markTreeConflict(java.io.File localRelPath, SVNConflictVersion oldVersion, SVNConflictVersion newVersion, java.io.File moveRootDstRelPath, SVNOperation operation, SVNNodeKind oldKind, SVNNodeKind newKind, java.io.File oldReposRelPath, SVNConflictReason reason, SVNConflictAction action, java.io.File moveSrcOpRootRelPath) throws SVNException
- Throws:
SVNException
-
-