public class SVNTreeConflictEditor extends java.lang.Object implements ISVNEditor2
Modifier and Type | Class and Description |
---|---|
private static class |
SVNTreeConflictEditor.UpdateWorkingProps |
private static class |
SVNTreeConflictEditor.WorkingNodeVersion |
Modifier and Type | Field and 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 and Description |
---|
SVNTreeConflictEditor(SVNWCDb db,
SVNOperation operation,
SVNConflictVersion oldVersion,
SVNConflictVersion newVersion,
SVNWCDbRoot wcRoot,
java.io.File moveRootDstRelPath) |
Modifier and Type | Method and 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) |
private final SVNOperation operation
private final SVNConflictVersion oldVersion
private final SVNConflictVersion newVersion
private final SVNWCDb db
private final SVNWCDbRoot wcRoot
private final java.io.File moveRootDstRelPath
private ISVNEventHandler eventHandler
private java.io.File conflictRootRelPath
public SVNTreeConflictEditor(SVNWCDb db, SVNOperation operation, SVNConflictVersion oldVersion, SVNConflictVersion newVersion, SVNWCDbRoot wcRoot, java.io.File moveRootDstRelPath)
public void addDir(java.lang.String path, java.util.List<java.lang.String> children, SVNProperties props, long replacesRev) throws SVNException
addDir
in interface ISVNEditor2
SVNException
public void addFile(java.lang.String path, SvnChecksum checksum, java.io.InputStream contents, SVNProperties props, long replacesRev) throws SVNException
addFile
in interface ISVNEditor2
SVNException
public void addSymlink(java.lang.String path, java.lang.String target, SVNProperties props, long replacesRev) throws SVNException
addSymlink
in interface ISVNEditor2
SVNException
public void addAbsent(java.lang.String path, SVNNodeKind kind, long replacesRev) throws SVNException
addAbsent
in interface ISVNEditor2
SVNException
public void alterDir(java.lang.String path, long revision, java.util.List<java.lang.String> children, SVNProperties props) throws SVNException
alterDir
in interface ISVNEditor2
SVNException
public void alterFile(java.lang.String path, long expectedMoveDstRevision, SVNProperties newProps, SvnChecksum newChecksum, java.io.InputStream newContents) throws SVNException
alterFile
in interface ISVNEditor2
SVNException
public void alterSymlink(java.lang.String path, long revision, SVNProperties props, java.lang.String target) throws SVNException
alterSymlink
in interface ISVNEditor2
SVNException
public void delete(java.lang.String path, long revision) throws SVNException
delete
in interface ISVNEditor2
SVNException
public void copy(java.lang.String srcPath, long srcRevision, java.lang.String dstPath, long replacesRev) throws SVNException
copy
in interface ISVNEditor2
SVNException
public void move(java.lang.String srcPath, long srcRevision, java.lang.String dstPath, long replacesRev) throws SVNException
move
in interface ISVNEditor2
SVNException
public void rotate(java.util.List<java.lang.String> relPaths, java.util.List<java.lang.String> revisions) throws SVNException
rotate
in interface ISVNEditor2
SVNException
public void complete()
complete
in interface ISVNEditor2
public void abort()
abort
in interface ISVNEditor2
private boolean checkTreeConflict(java.io.File localRelPath, SVNNodeKind oldKind, SVNNodeKind newKind, java.io.File oldReposRelPath, SVNConflictAction action) throws SVNException
SVNException
private SVNTreeConflictEditor.UpdateWorkingProps updateWorkingProps(SVNSkel conflictSkel, java.io.File localAbsPath, SVNTreeConflictEditor.WorkingNodeVersion oldNodeVersion, SVNTreeConflictEditor.WorkingNodeVersion newNodeVersion) throws SVNException
SVNException
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
SVNException
private void updateWorkingFile(java.io.File localRelPath, java.io.File reposRelPath, SVNOperation operation, SVNTreeConflictEditor.WorkingNodeVersion oldNodeVersion, SVNTreeConflictEditor.WorkingNodeVersion newNodeVersion) throws SVNException
SVNException
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
SVNException