public SVNStatusType[] directoryClosed(String path, boolean[] isTreeConflicted) throws SVNException { setIsConflicted(isTreeConflicted, false); return new SVNStatusType[] { SVNStatusType.UNKNOWN, SVNStatusType.UNKNOWN }; }
public SVNStatusType[] directoryClosed(String path, boolean[] isTreeConflicted) throws SVNException { setIsConflicted(isTreeConflicted, false); return new SVNStatusType[] { SVNStatusType.UNKNOWN, SVNStatusType.UNKNOWN }; }
public SVNStatusType[] directoryClosed(String path, boolean[] isTreeConflicted) throws SVNException { setIsConflicted(isTreeConflicted, false); return new SVNStatusType[] { SVNStatusType.UNKNOWN, SVNStatusType.UNKNOWN }; }
public void directoryOpened(String path, long revision, boolean[] isTreeConflicted) throws SVNException { setIsConflicted(isTreeConflicted, false); File mergedFile = getFile(path); SVNAdminArea dir = retrieve(mergedFile.getParentFile(), myIsDryRun); if (dir == null) { return; } SVNEntry entry = getWCAccess().getEntry(mergedFile, true); SVNFileType type = SVNFileType.getType(mergedFile); if (entry == null || entry.isScheduledForDeletion() || type != SVNFileType.DIRECTORY) { myMergeDriver.recordTreeConflict(mergedFile, dir, SVNNodeKind.DIR, SVNConflictAction.EDIT, SVNConflictReason.DELETED); setIsConflicted(isTreeConflicted, true); } }
public void directoryOpened(String path, long revision, boolean[] isTreeConflicted) throws SVNException { setIsConflicted(isTreeConflicted, false); File mergedFile = getFile(path); SVNAdminArea dir = retrieve(mergedFile.getParentFile(), myIsDryRun); if (dir == null) { return; } SVNEntry entry = getWCAccess().getEntry(mergedFile, true); SVNFileType type = SVNFileType.getType(mergedFile); if (entry == null || entry.isScheduledForDeletion()) { myMergeDriver.recordTreeConflict(mergedFile, dir, SVNNodeKind.DIR, SVNConflictAction.EDIT, SVNConflictReason.DELETED); setIsConflicted(isTreeConflicted, true); } else if (entry.isDirectory() && type == SVNFileType.NONE) { myMergeDriver.recordTreeConflict(mergedFile, dir, SVNNodeKind.DIR, SVNConflictAction.EDIT, SVNConflictReason.MISSING); setIsConflicted(isTreeConflicted, true); } else if (entry.isDirectory() && type != SVNFileType.DIRECTORY) { myMergeDriver.recordTreeConflict(mergedFile, dir, SVNNodeKind.DIR, SVNConflictAction.EDIT, SVNConflictReason.OBSTRUCTED); setIsConflicted(isTreeConflicted, true); } else if (type != SVNFileType.DIRECTORY) { // entry of different kind as well, directory has been deleted. myMergeDriver.recordTreeConflict(mergedFile, dir, SVNNodeKind.DIR, SVNConflictAction.EDIT, SVNConflictReason.DELETED); setIsConflicted(isTreeConflicted, true); } }
public void directoryOpened(String path, long revision, boolean[] isTreeConflicted) throws SVNException { setIsConflicted(isTreeConflicted, false); File mergedFile = getFile(path); SVNAdminArea dir = retrieve(mergedFile.getParentFile(), myIsDryRun); if (dir == null) { return; } SVNEntry entry = getWCAccess().getEntry(mergedFile, true); SVNFileType type = SVNFileType.getType(mergedFile); if (entry == null || entry.isScheduledForDeletion()) { myMergeDriver.recordTreeConflict(mergedFile, dir, SVNNodeKind.DIR, SVNConflictAction.EDIT, SVNConflictReason.DELETED); setIsConflicted(isTreeConflicted, true); } else if (entry.isDirectory() && type == SVNFileType.NONE) { myMergeDriver.recordTreeConflict(mergedFile, dir, SVNNodeKind.DIR, SVNConflictAction.EDIT, SVNConflictReason.MISSING); setIsConflicted(isTreeConflicted, true); } else if (entry.isDirectory() && type != SVNFileType.DIRECTORY) { myMergeDriver.recordTreeConflict(mergedFile, dir, SVNNodeKind.DIR, SVNConflictAction.EDIT, SVNConflictReason.OBSTRUCTED); setIsConflicted(isTreeConflicted, true); } else if (type != SVNFileType.DIRECTORY) { // entry of different kind as well, directory has been deleted. myMergeDriver.recordTreeConflict(mergedFile, dir, SVNNodeKind.DIR, SVNConflictAction.EDIT, SVNConflictReason.DELETED); setIsConflicted(isTreeConflicted, true); } }
public SVNStatusType fileDeleted(String path, File file1, File file2, String mimeType1, String mimeType2, SVNProperties originalProperties, boolean[] isTreeConflicted) throws SVNException { setIsConflicted(isTreeConflicted, false); File mergedFile = getFile(path); SVNAdminArea dir = retrieve(mergedFile.getParentFile(), true); setIsConflicted(isTreeConflicted, true); return SVNStatusType.OBSTRUCTED; } else if (fileType == SVNFileType.DIRECTORY) { myMergeDriver.recordTreeConflict(mergedFile, dir, SVNNodeKind.FILE, SVNConflictAction.DELETE, SVNConflictReason.OBSTRUCTED); setIsConflicted(isTreeConflicted, true); return SVNStatusType.OBSTRUCTED; } else if (fileType == SVNFileType.NONE) { myMergeDriver.recordTreeConflict(mergedFile, dir, SVNNodeKind.FILE, SVNConflictAction.DELETE, SVNConflictReason.DELETED); setIsConflicted(isTreeConflicted, true); return SVNStatusType.MISSING;
public SVNStatusType fileDeleted(String path, File file1, File file2, String mimeType1, String mimeType2, SVNProperties originalProperties, boolean[] isTreeConflicted) throws SVNException { setIsConflicted(isTreeConflicted, false); File mergedFile = getFile(path); SVNAdminArea dir = retrieve(mergedFile.getParentFile(), true); setIsConflicted(isTreeConflicted, true); return SVNStatusType.OBSTRUCTED; } else if (fileType == SVNFileType.DIRECTORY) { myMergeDriver.recordTreeConflict(mergedFile, dir, SVNNodeKind.FILE, SVNConflictAction.DELETE, SVNConflictReason.OBSTRUCTED); setIsConflicted(isTreeConflicted, true); return SVNStatusType.OBSTRUCTED; } else if (fileType == SVNFileType.NONE) { myMergeDriver.recordTreeConflict(mergedFile, dir, SVNNodeKind.FILE, SVNConflictAction.DELETE, SVNConflictReason.DELETED); setIsConflicted(isTreeConflicted, true); return SVNStatusType.MISSING;
public SVNStatusType fileDeleted(String path, File file1, File file2, String mimeType1, String mimeType2, SVNProperties originalProperties, boolean[] isTreeConflicted) throws SVNException { setIsConflicted(isTreeConflicted, false); File mergedFile = getFile(path); SVNAdminArea dir = retrieve(mergedFile.getParentFile(), true); setIsConflicted(isTreeConflicted, true); return SVNStatusType.OBSTRUCTED; } else if (fileType == SVNFileType.DIRECTORY) { myMergeDriver.recordTreeConflict(mergedFile, dir, SVNNodeKind.FILE, SVNConflictAction.DELETE, SVNConflictReason.OBSTRUCTED); setIsConflicted(isTreeConflicted, true); return SVNStatusType.OBSTRUCTED; } else if (fileType == SVNFileType.NONE) { myMergeDriver.recordTreeConflict(mergedFile, dir, SVNNodeKind.FILE, SVNConflictAction.DELETE, SVNConflictReason.DELETED); setIsConflicted(isTreeConflicted, true); return SVNStatusType.MISSING;
public SVNStatusType directoryDeleted(final String path, boolean[] isTreeConflicted) throws SVNException { setIsConflicted(isTreeConflicted, false); final File mergedFile = getFile(path); final SVNAdminArea dir = retrieve(mergedFile.getParentFile(), true); } catch (SVNException e) { myMergeDriver.recordTreeConflict(mergedFile, dir, SVNNodeKind.DIR, SVNConflictAction.DELETE, SVNConflictReason.EDITED); setIsConflicted(isTreeConflicted, true); return SVNStatusType.CONFLICTED; } finally { setIsConflicted(isTreeConflicted, true); } else if (fileType == SVNFileType.FILE || fileType == SVNFileType.SYMLINK) { return SVNStatusType.OBSTRUCTED; } else if (fileType == SVNFileType.NONE) { myMergeDriver.recordTreeConflict(mergedFile, dir, SVNNodeKind.DIR, SVNConflictAction.DELETE, SVNConflictReason.DELETED); setIsConflicted(isTreeConflicted, true); return SVNStatusType.MISSING;
public SVNStatusType directoryDeleted(final String path, boolean[] isTreeConflicted) throws SVNException { setIsConflicted(isTreeConflicted, false); final File mergedFile = getFile(path); final SVNAdminArea dir = retrieve(mergedFile.getParentFile(), true); } catch (SVNException e) { myMergeDriver.recordTreeConflict(mergedFile, dir, SVNNodeKind.DIR, SVNConflictAction.DELETE, SVNConflictReason.EDITED); setIsConflicted(isTreeConflicted, true); return SVNStatusType.CONFLICTED; } finally { setIsConflicted(isTreeConflicted, true); } else if (fileType == SVNFileType.FILE || fileType == SVNFileType.SYMLINK) { return SVNStatusType.OBSTRUCTED; } else if (fileType == SVNFileType.NONE) { myMergeDriver.recordTreeConflict(mergedFile, dir, SVNNodeKind.DIR, SVNConflictAction.DELETE, SVNConflictReason.DELETED); setIsConflicted(isTreeConflicted, true); return SVNStatusType.MISSING;
public SVNStatusType[] fileAdded(String path, File file1, File file2, long revision1, long revision2, String mimeType1, String mimeType2, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted) throws SVNException { setIsConflicted(isTreeConflicted, false); SVNStatusType[] result = new SVNStatusType[] {null, SVNStatusType.UNKNOWN}; SVNProperties newProps = new SVNProperties(originalProperties); setIsConflicted(isTreeConflicted, true); if (myIsDryRun && isPathDeleted(path)) { result[0] = SVNStatusType.CHANGED; } else { myMergeDriver.recordTreeConflict(mergedFile, dir, SVNNodeKind.FILE, SVNConflictAction.ADD, SVNConflictReason.OBSTRUCTED); setIsConflicted(isTreeConflicted, true);
public SVNStatusType[] fileChanged(String path, File file1, File file2, long revision1, long revision2, String mimeType1, String mimeType2, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted) throws SVNException { setIsConflicted(isTreeConflicted, false); boolean needsMerge = true; File mergedFile = getFile(path); setIsConflicted(isTreeConflicted, true); return new SVNStatusType[] {SVNStatusType.MISSING, SVNStatusType.MISSING}; result[1] = propertiesChanged(path, originalProperties, diff, isTreeConflicted2); if (isTreeConflicted2[0]) { setIsConflicted(isTreeConflicted, true); return result;
public SVNStatusType directoryDeleted(final String path, boolean[] isTreeConflicted) throws SVNException { setIsConflicted(isTreeConflicted, false); final File mergedFile = getFile(path); final SVNAdminArea dir = retrieve(mergedFile.getParentFile(), true); setIsConflicted(isTreeConflicted, true); } else if (fileType == SVNFileType.FILE || fileType == SVNFileType.SYMLINK) { return SVNStatusType.OBSTRUCTED; } else if (fileType == SVNFileType.NONE) { myMergeDriver.recordTreeConflict(mergedFile, dir, SVNNodeKind.DIR, SVNConflictAction.DELETE, SVNConflictReason.DELETED); setIsConflicted(isTreeConflicted, true); return SVNStatusType.MISSING;
public SVNStatusType propertiesChanged(String path, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted) throws SVNException { setIsConflicted(isTreeConflicted, false); SVNStatusType obstructedStatus = getStatusForObstructedOrMissing(path); if (obstructedStatus != SVNStatusType.INAPPLICABLE) { if (e.getErrorMessage().getErrorCode() == SVNErrorCode.UNVERSIONED_RESOURCE || e.getErrorMessage().getErrorCode() == SVNErrorCode.ENTRY_NOT_FOUND) { setIsConflicted(isTreeConflicted, true); return SVNStatusType.MISSING;
public SVNStatusType propertiesChanged(String path, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted) throws SVNException { setIsConflicted(isTreeConflicted, false); SVNStatusType obstructedStatus = getStatusForObstructedOrMissing(path); if (obstructedStatus != SVNStatusType.INAPPLICABLE) { if (e.getErrorMessage().getErrorCode() == SVNErrorCode.UNVERSIONED_RESOURCE || e.getErrorMessage().getErrorCode() == SVNErrorCode.ENTRY_NOT_FOUND) { setIsConflicted(isTreeConflicted, true); return SVNStatusType.MISSING;
public SVNStatusType propertiesChanged(String path, SVNProperties originalProperties, SVNProperties diff, boolean[] isTreeConflicted) throws SVNException { setIsConflicted(isTreeConflicted, false); SVNStatusType obstructedStatus = getStatusForObstructedOrMissing(path); if (obstructedStatus != SVNStatusType.INAPPLICABLE) { if (e.getErrorMessage().getErrorCode() == SVNErrorCode.UNVERSIONED_RESOURCE || e.getErrorMessage().getErrorCode() == SVNErrorCode.ENTRY_NOT_FOUND) { setIsConflicted(isTreeConflicted, true); return SVNStatusType.MISSING;
public SVNStatusType directoryAdded(String path, long revision, boolean[] isTreeConflicted) throws SVNException { setIsConflicted(isTreeConflicted, false); File mergedFile = getFile(path); SVNAdminArea dir = retrieve(mergedFile.getParentFile(), true); setIsConflicted(isTreeConflicted, true); setIsConflicted(isTreeConflicted, true); return SVNStatusType.OBSTRUCTED;
public SVNStatusType directoryAdded(String path, long revision, boolean[] isTreeConflicted) throws SVNException { setIsConflicted(isTreeConflicted, false); File mergedFile = getFile(path); SVNAdminArea dir = retrieve(mergedFile.getParentFile(), true); setIsConflicted(isTreeConflicted, true); setIsConflicted(isTreeConflicted, true); return SVNStatusType.OBSTRUCTED;
public SVNStatusType directoryAdded(String path, long revision, boolean[] isTreeConflicted) throws SVNException { setIsConflicted(isTreeConflicted, false); File mergedFile = getFile(path); SVNAdminArea dir = retrieve(mergedFile.getParentFile(), true); setIsConflicted(isTreeConflicted, true); setIsConflicted(isTreeConflicted, true); return SVNStatusType.OBSTRUCTED;