protected File getTempDirectory() throws SVNException { if (myTempDirectory == null) { myTempDirectory = getDiffCallback().createTempDirectory(); } return myTempDirectory; }
protected File getTempDirectory() throws SVNException { if (myTempDirectory == null) { myTempDirectory = getDiffCallback().createTempDirectory(); } return myTempDirectory; }
protected File getTempDirectory() throws SVNException { if (myTempDirectory == null) { myTempDirectory = getDiffCallback().createTempDirectory(); } return myTempDirectory; }
protected File getTempDirectory() throws SVNException { if (myTempDirectory == null) { myTempDirectory = getDiffCallback().createTempDirectory(); } return myTempDirectory; }
public void openDir(String path, long revision) throws SVNException { SVNDirectoryInfo parentDir = myCurrentDirectory; myCurrentDirectory = new SVNDirectoryInfo(myCurrentDirectory, path, false); if (parentDir.myIsSkip || parentDir.myIsTreeConflicted) { myCurrentDirectory.myIsSkip = true; return; } myCurrentDirectory.loadFromRepository(revision); boolean[] isTreeConflicted = { false }; getDiffCallback().directoryOpened(path, revision, isTreeConflicted); myCurrentDirectory.myIsTreeConflicted = isTreeConflicted[0]; }
public void openDir(String path, long revision) throws SVNException { SVNDirectoryInfo parentDir = myCurrentDirectory; myCurrentDirectory = new SVNDirectoryInfo(myCurrentDirectory, path, false); if (parentDir.myIsSkip || parentDir.myIsTreeConflicted) { myCurrentDirectory.myIsSkip = true; return; } myCurrentDirectory.loadFromRepository(revision); boolean[] isTreeConflicted = { false }; getDiffCallback().directoryOpened(path, revision, isTreeConflicted); myCurrentDirectory.myIsTreeConflicted = isTreeConflicted[0]; }
public void openDir(String path, long revision) throws SVNException { SVNDirectoryInfo parentDir = myCurrentDirectory; myCurrentDirectory = new SVNDirectoryInfo(myCurrentDirectory, path, false); if (parentDir.myIsSkip || parentDir.myIsTreeConflicted) { myCurrentDirectory.myIsSkip = true; return; } myCurrentDirectory.loadFromRepository(revision); boolean[] isTreeConflicted = { false }; getDiffCallback().directoryOpened(path, revision, isTreeConflicted); myCurrentDirectory.myIsTreeConflicted = isTreeConflicted[0]; }
protected void deleteEntry(String path, SVNNodeKind nodeKind, SVNAdminArea dir) throws SVNException { SVNStatusType type = SVNStatusType.INAPPLICABLE; SVNEventAction action = SVNEventAction.SKIP; SVNEventAction expectedAction = SVNEventAction.UPDATE_DELETE; boolean[] isTreeConflicted = { false }; if (myAdminArea == null || dir != null) { if (nodeKind == SVNNodeKind.FILE) { SVNFileInfo file = new SVNFileInfo(path, false); file.loadFromRepository(myRevision1); String baseType = file.myBaseProperties.getStringValue(SVNProperty.MIME_TYPE); type = getDiffCallback().fileDeleted(path, file.myBaseFile, null, baseType, null, file.myBaseProperties, isTreeConflicted); } else if (nodeKind == SVNNodeKind.DIR) { type = getDiffCallback().directoryDeleted(path, isTreeConflicted); } if (type != SVNStatusType.MISSING && type != SVNStatusType.OBSTRUCTED && !isTreeConflicted[0]) { action = SVNEventAction.UPDATE_DELETE; if (myIsDryRun) { getDiffCallback().addDeletedPath(path); } } } action = isTreeConflicted[0] ? SVNEventAction.TREE_CONFLICT : action; addDeletedPath(path, nodeKind, type, action, expectedAction, isTreeConflicted[0]); }
protected void deleteEntry(String path, SVNNodeKind nodeKind, SVNAdminArea dir) throws SVNException { SVNStatusType type = SVNStatusType.INAPPLICABLE; SVNEventAction action = SVNEventAction.SKIP; SVNEventAction expectedAction = SVNEventAction.UPDATE_DELETE; boolean[] isTreeConflicted = { false }; if (myAdminArea == null || dir != null) { if (nodeKind == SVNNodeKind.FILE) { SVNFileInfo file = new SVNFileInfo(path, false); file.loadFromRepository(myRevision1); String baseType = file.myBaseProperties.getStringValue(SVNProperty.MIME_TYPE); type = getDiffCallback().fileDeleted(path, file.myBaseFile, null, baseType, null, file.myBaseProperties, isTreeConflicted); } else if (nodeKind == SVNNodeKind.DIR) { type = getDiffCallback().directoryDeleted(path, isTreeConflicted); } if (type != SVNStatusType.MISSING && type != SVNStatusType.OBSTRUCTED && !isTreeConflicted[0]) { action = SVNEventAction.UPDATE_DELETE; if (myIsDryRun) { getDiffCallback().addDeletedPath(path); } } } action = isTreeConflicted[0] ? SVNEventAction.TREE_CONFLICT : action; addDeletedPath(path, nodeKind, type, action, expectedAction, isTreeConflicted[0]); }
protected void deleteEntry(String path, SVNNodeKind nodeKind, SVNAdminArea dir) throws SVNException { SVNStatusType type = SVNStatusType.INAPPLICABLE; SVNEventAction action = SVNEventAction.SKIP; SVNEventAction expectedAction = SVNEventAction.UPDATE_DELETE; boolean[] isTreeConflicted = { false }; if (myAdminArea == null || dir != null) { if (nodeKind == SVNNodeKind.FILE) { SVNFileInfo file = new SVNFileInfo(path, false); file.loadFromRepository(myRevision1); String baseType = file.myBaseProperties.getStringValue(SVNProperty.MIME_TYPE); type = getDiffCallback().fileDeleted(path, file.myBaseFile, null, baseType, null, file.myBaseProperties, isTreeConflicted); } else if (nodeKind == SVNNodeKind.DIR) { type = getDiffCallback().directoryDeleted(path, isTreeConflicted); } if (type != SVNStatusType.MISSING && type != SVNStatusType.OBSTRUCTED && !isTreeConflicted[0]) { action = SVNEventAction.UPDATE_DELETE; if (myIsDryRun) { getDiffCallback().addDeletedPath(path); } } } action = isTreeConflicted[0] ? SVNEventAction.TREE_CONFLICT : action; addDeletedPath(path, nodeKind, type, action, expectedAction, isTreeConflicted[0]); }
public void deleteEntry(String path, long revision) throws SVNException { SVNStatusType type = SVNStatusType.INAPPLICABLE; SVNEventAction action = SVNEventAction.SKIP; SVNEventAction expectedAction = SVNEventAction.UPDATE_DELETE; SVNNodeKind nodeKind = myRepos.checkPath(path, myRevision1); SVNAdminArea dir = retrieve(myCurrentDirectory.myWCFile, true); if (myAdminInfo == null || dir != null) { if (nodeKind == SVNNodeKind.FILE) { SVNFileInfo file = new SVNFileInfo(path, false); file.loadFromRepository(); String baseType = (String) file.myBaseProperties.get(SVNProperty.MIME_TYPE); type = getDiffCallback().fileDeleted(path, file.myBaseFile, null, baseType, null, file.myBaseProperties); } else if (nodeKind == SVNNodeKind.DIR) { type = getDiffCallback().directoryDeleted(path); } if (type != SVNStatusType.MISSING && type != SVNStatusType.OBSTRUCTED) { action = SVNEventAction.UPDATE_DELETE; if (myIsDryRun) { getDiffCallback().addDeletedPath(path); } } } if (myEventHandler != null) { SVNEvent event = SVNEventFactory.createMergeEvent(myAdminInfo, path, action, expectedAction, type, type, nodeKind); myEventHandler.handleEvent(event, ISVNEventHandler.UNKNOWN); } }
public void addDir(String path, String copyFromPath, long copyFromRevision) throws SVNException { myCurrentDirectory = new SVNDirectoryInfo(myCurrentDirectory, path, true); myCurrentDirectory.myBaseProperties = Collections.EMPTY_MAP; SVNEventAction expectedAction = SVNEventAction.UPDATE_ADD; SVNEventAction action = expectedAction; SVNStatusType type = getDiffCallback().directoryAdded(path, myRevision2); if (myEventHandler != null) { if (type == SVNStatusType.MISSING || type == SVNStatusType.OBSTRUCTED) { action = SVNEventAction.SKIP; } // TODO prop type? SVNEvent event = SVNEventFactory.createMergeEvent(myAdminInfo, path, action, expectedAction, type, type, SVNNodeKind.DIR); myEventHandler.handleEvent(event, ISVNEventHandler.UNKNOWN); } }
SVNStatusType type = getDiffCallback().directoryAdded(path, myRevision2, isTreeConflicted); myCurrentDirectory.myIsTreeConflicted = isTreeConflicted[0];
SVNStatusType type = getDiffCallback().directoryAdded(path, myRevision2, isTreeConflicted); myCurrentDirectory.myIsTreeConflicted = isTreeConflicted[0];
getDiffCallback().clearDeletedPaths(); type = getDiffCallback().propertiesChanged(myCurrentDirectory.myRepositoryPath, myCurrentDirectory.myBaseProperties, myCurrentDirectory.myPropertyDiff, isTreeConflicted); if (isTreeConflicted[0]) { getDiffCallback().directoryClosed(myCurrentDirectory.myRepositoryPath, null);
String mimeType = (String) myCurrentFile.myPropertyDiff.get(SVNProperty.MIME_TYPE); if (myCurrentFile.myIsAdded) { type = getDiffCallback().fileAdded(commitPath, myCurrentFile.myFile != null ? myCurrentFile.myBaseFile : null, myCurrentFile.myFile, 0, myRevision2, baseMimeType, mimeType, myCurrentFile.myBaseProperties, myCurrentFile.myPropertyDiff); } else { type = getDiffCallback().fileChanged(commitPath, myCurrentFile.myFile != null ? myCurrentFile.myBaseFile : null, myCurrentFile.myFile, myRevision1, myRevision2, baseMimeType, mimeType,
getDiffCallback().clearDeletedPaths(); type = getDiffCallback().propertiesChanged(myCurrentDirectory.myRepositoryPath, myCurrentDirectory.myBaseProperties, myCurrentDirectory.myPropertyDiff);
SVNEventAction action = expectedAction; boolean[] isTreeConflicted = { false }; SVNStatusType type = getDiffCallback().directoryAdded(path, myRevision2, isTreeConflicted); myCurrentDirectory.myIsTreeConflicted = isTreeConflicted[0]; if (myCurrentDirectory.myIsTreeConflicted) {
String mimeType = propertyDiff.getStringValue(SVNProperty.MIME_TYPE); if (added) { type = getDiffCallback().fileAdded(commitPath, file != null ? baseFile : null, file, 0, myRevision2, baseMimeType, mimeType, baseProperties, propertyDiff, isTreeConflicted); } else { type = getDiffCallback().fileChanged(commitPath, file != null ? baseFile : null, file, myRevision1, myRevision2, baseMimeType, mimeType,
String mimeType = propertyDiff.getStringValue(SVNProperty.MIME_TYPE); if (added) { type = getDiffCallback().fileAdded(commitPath, file != null ? baseFile : null, file, 0, myRevision2, baseMimeType, mimeType, baseProperties, propertyDiff, isTreeConflicted); } else { type = getDiffCallback().fileChanged(commitPath, file != null ? baseFile : null, file, myRevision1, myRevision2, baseMimeType, mimeType,