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