Bug 64845 [Commit Sets] caching the log entries is not needed for 2-waycompare

2 files changed, 9 insertions, 0 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteLogOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteLogOperation.java
index 264b70f9c..88ec1fe4b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteLogOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteLogOperation.java
@@ -67,6 +67,11 @@ public class RemoteLogOperation extends RepositoryLocationOperation {
 		entries.remove(resource);
 		allEntries.remove(resource);
 	}
+	
+	public void clearEntries() {
+		entries.clear();
+		allEntries.clear();
+	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryLocationOperation#execute(org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation, org.eclipse.team.internal.ccvs.core.ICVSRemoteResource[], org.eclipse.core.runtime.IProgressMonitor)
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ChangeLogModelProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ChangeLogModelProvider.java
index 32770bfa2..0a8180300 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ChangeLogModelProvider.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ChangeLogModelProvider.java
@@ -349,6 +349,10 @@ public class ChangeLogModelProvider extends SynchronizeModelProvider {
 				for (int i = 0; i < commentInfos.length; i++) {
 					addSyncInfoToCommentNode(commentInfos[i], logs);
 				}
+				// Don't cache log entries when in two way mode.
+				if(getConfiguration().getComparisonType().equals(ISynchronizePageConfiguration.TWO_WAY)) {
+					logs.clearEntries();
+				}
 			}
 		} catch (CVSException e) {
 			Utils.handle(e);