Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2004-11-22 20:10:59 +0000
committerMichael Valenta2004-11-22 20:10:59 +0000
commit093a55607334f5ba15318c2bea4fead5c8ab932b (patch)
treeeb1968afcdb211258163eb0e987aa86d8893fe9d
parent109c590c1c248960926a2a6b064813bb13d3c93d (diff)
downloadeclipse.platform.team-093a55607334f5ba15318c2bea4fead5c8ab932b.tar.gz
eclipse.platform.team-093a55607334f5ba15318c2bea4fead5c8ab932b.tar.xz
eclipse.platform.team-093a55607334f5ba15318c2bea4fead5c8ab932b.zip
Bug 46989 [Repo View] Compare with dialog should not include BASE tag.
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteWithTagAction.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionDialog.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java9
4 files changed, 14 insertions, 7 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteWithTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteWithTagAction.java
index 3336872d1..cd6c7e6a3 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteWithTagAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteWithTagAction.java
@@ -38,7 +38,11 @@ public class CompareRemoteWithTagAction extends CVSAction {
final CVSTag[] tag = new CVSTag[] { null};
run(new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) {
- tag[0] = TagSelectionDialog.getTagToCompareWith(getShell(), TagSource.create(resources));
+ tag[0] = TagSelectionDialog.getTagToCompareWith(getShell(), TagSource.create(resources),
+ TagSelectionDialog.INCLUDE_BRANCHES |
+ TagSelectionDialog.INCLUDE_VERSIONS |
+ TagSelectionDialog.INCLUDE_DATES |
+ TagSelectionDialog.INCLUDE_HEAD_TAG);
}
}, false /* cancelable */, PROGRESS_BUSYCURSOR);
if (tag[0] == null) return;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java
index 701cdd720..ef14f400b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java
@@ -52,7 +52,7 @@ public class CompareWithTagAction extends WorkspaceAction {
}
protected CVSTag promptForTag(IResource[] resources) {
- CVSTag tag = TagSelectionDialog.getTagToCompareWith(getShell(), TagSource.create(resources));
+ CVSTag tag = TagSelectionDialog.getTagToCompareWith(getShell(), TagSource.create(resources), TagSelectionDialog.INCLUDE_ALL_TAGS);
return tag;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionDialog.java
index 43ec1b65f..30050625d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionDialog.java
@@ -61,11 +61,11 @@ public class TagSelectionDialog extends Dialog implements IPropertyChangeListene
private boolean showRecurse;
- public static CVSTag getTagToCompareWith(Shell shell, TagSource tagSource) {
+ public static CVSTag getTagToCompareWith(Shell shell, TagSource tagSource, int includeFlags) {
TagSelectionDialog dialog = new TagSelectionDialog(shell, tagSource,
Policy.bind("CompareWithTagAction.message"), //$NON-NLS-1$
Policy.bind("TagSelectionDialog.Select_a_Tag_1"), //$NON-NLS-1$
- TagSelectionDialog.INCLUDE_ALL_TAGS,
+ includeFlags,
false, /* show recurse*/
IHelpContextIds.COMPARE_TAG_SELECTION_DIALOG);
dialog.setBlockOnOpen(true);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java
index 634982b99..0dfe5a4db 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java
@@ -21,8 +21,6 @@ import org.eclipse.team.internal.ccvs.ui.*;
import org.eclipse.team.internal.ccvs.ui.Policy;
import org.eclipse.team.internal.ccvs.ui.operations.*;
import org.eclipse.team.internal.ccvs.ui.tags.*;
-import org.eclipse.team.internal.ccvs.ui.tags.TagSourceWorkbenchAdapter;
-import org.eclipse.team.internal.ccvs.ui.tags.TagSource;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.NewProjectAction;
@@ -92,7 +90,12 @@ public class CheckoutAsWizard extends Wizard {
locationSelectionPage = new CheckoutAsLocationSelectionPage(substImage, remoteFolders);
addPage(locationSelectionPage);
- tagSelectionPage = new TagSelectionWizardPage("tagPage", Policy.bind("CheckoutAsWizard.3"), substImage, Policy.bind("CheckoutAsWizard.4"), TagSource.create(remoteFolders), TagSourceWorkbenchAdapter.INCLUDE_ALL_TAGS); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ tagSelectionPage = new TagSelectionWizardPage("tagPage", Policy.bind("CheckoutAsWizard.3"), substImage, Policy.bind("CheckoutAsWizard.4"), TagSource.create(remoteFolders), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ TagSelectionArea.INCLUDE_HEAD_TAG |
+ TagSelectionArea.INCLUDE_BRANCHES |
+ TagSelectionArea.INCLUDE_VERSIONS |
+ TagSelectionArea.INCLUDE_DATES
+ );
if (remoteFolders.length > 0) {
try {
CVSTag selectedTag = remoteFolders[0].getFolderSyncInfo().getTag();

Back to the top