Bug 39145 [live sync view] revision # not shown in compare editor

2 files changed, 32 insertions, 0 deletions

diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SyncInfo.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SyncInfo.java
index d916405a4..e35305332 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SyncInfo.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SyncInfo.java
@@ -152,6 +152,16 @@ public class SyncInfo implements IAdaptable {
 	public IResource getLocal() {
 		return local;
 	}
+	
+	/**
+	 * Returns the content identifier for the local resource or <code>null</code> if
+	 * it doesn't have one. For example, in CVS this would be the revision number. 
+	 * 
+	 * @return String that could be displayed to the user to identify this resource. 
+	 */
+	public String getLocalContentIdentifier() {
+		return null;
+	}
 		
 	/**
 	 * Returns the remote resource handle  for the base resource,
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncInfo.java
index b9fc5475a..f6bd0e402 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncInfo.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncInfo.java
@@ -11,6 +11,7 @@
 package org.eclipse.team.internal.ccvs.core;
 
 import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.team.core.TeamException;
@@ -324,4 +325,25 @@ public class CVSSyncInfo extends SyncInfo {
 		}
 		return result.toString();
 	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.team.core.subscribers.SyncInfo#getContentIdentifier()
+	 */
+	public String getLocalContentIdentifier() {
+		try {
+			IResource local = getLocal();
+			if (local != null || local.getType() == IResource.FILE) {
+				// it's a file, return the revision number if we can find one
+				ICVSFile cvsFile = CVSWorkspaceRoot.getCVSFileFor((IFile) local);
+				ResourceSyncInfo info = cvsFile.getSyncInfo();
+				if (info != null) {
+					return info.getRevision();
+				}
+			}
+		} catch (CVSException e) {
+			CVSProviderPlugin.log(e);
+			return null;
+		}
+		return null;
+	}
 }