Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames2002-04-06 14:59:07 -0500
committerjames2002-04-06 14:59:07 -0500
commita4cd8636b297878c7bb60639f9b8340b06f570c7 (patch)
tree49a12a6973ed5c666c1c3647d30e56c1f59632f1
parent8fed03e2f8bcdb288663c055f4aca95be731cbc2 (diff)
downloadeclipse.platform.team-a4cd8636b297878c7bb60639f9b8340b06f570c7.tar.gz
eclipse.platform.team-a4cd8636b297878c7bb60639f9b8340b06f570c7.tar.xz
eclipse.platform.team-a4cd8636b297878c7bb60639f9b8340b06f570c7.zip
270: Could have user name in Synchronize view (1GKX9QX)root_newTagConfiguration
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java14
2 files changed, 13 insertions, 3 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
index 1f986c400..aa861546d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
@@ -52,7 +52,7 @@ CVSCatchupReleaseViewer.commonFileRevision=Common file: {0} {1}
CVSCatchupReleaseViewer.noCommonFile=No common file
CVSCatchupReleaseViewer.noRepositoryFile=No repository file
CVSCatchupReleaseViewer.repositoryFile=Repository file: {0}
-CVSCatchupReleaseViewer.repositoryFileRevision=Repository file: {0} {1}
+CVSCatchupReleaseViewer.repositoryFileRevision=Repository file: {0} {1} [{2}]
CVSCatchupReleaseViewer.workspaceFile=Workspace file: {0}
CVSCatchupReleaseViewer.showInHistory=Show in Resource History
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java
index fa1f3f6b5..2c8f84410 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java
@@ -9,6 +9,7 @@ import org.eclipse.compare.CompareConfiguration;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.Separator;
@@ -29,6 +30,7 @@ import org.eclipse.team.ccvs.core.CVSTag;
import org.eclipse.team.ccvs.core.ICVSFile;
import org.eclipse.team.ccvs.core.ICVSFolder;
import org.eclipse.team.ccvs.core.ICVSRemoteFile;
+import org.eclipse.team.ccvs.core.ILogEntry;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.core.sync.IRemoteResource;
import org.eclipse.team.core.sync.IRemoteSyncElement;
@@ -278,8 +280,16 @@ public class CVSCatchupReleaseViewer extends CatchupReleaseViewer {
IRemoteResource remote = syncTree.getRemote();
if (remote != null) {
try {
- String revision = ((ICVSRemoteFile)remote).getRevision();
- config.setRightLabel(Policy.bind("CVSCatchupReleaseViewer.repositoryFileRevision", new Object[] {name, revision}));
+ ICVSRemoteFile remoteFile = (ICVSRemoteFile)remote;
+ String revision = remoteFile.getRevision();
+ ILogEntry logEntry = remoteFile.getLogEntry();
+ if (logEntry == null) {
+ // Hack: call getContents() so that the log entry is available.
+ remoteFile.getContents(new NullProgressMonitor());
+ logEntry = remoteFile.getLogEntry();
+ }
+ String author = logEntry.getAuthor();
+ config.setRightLabel(Policy.bind("CVSCatchupReleaseViewer.repositoryFileRevision", new Object[] {name, revision, author}));
} catch (TeamException e) {
ErrorDialog.openError(getControl().getShell(), null, null, e.getStatus());
config.setRightLabel(Policy.bind("CVSCatchupReleaseViewer.repositoryFile", name));

Back to the top