diff options
| author | Michael Valenta | 2004-10-29 14:00:38 +0000 |
|---|---|---|
| committer | Michael Valenta | 2004-10-29 14:00:38 +0000 |
| commit | d2b1128544c91def401b4cd36b6fa833bcd5ab8f (patch) | |
| tree | 48c0c8890e5f4d9865abcb8e3df1983fb15c9821 /bundles | |
| parent | 804da0ac2f3d634f250221c712db2e7fb6b6d141 (diff) | |
| download | eclipse.platform.team-d2b1128544c91def401b4cd36b6fa833bcd5ab8f.tar.gz eclipse.platform.team-d2b1128544c91def401b4cd36b6fa833bcd5ab8f.tar.xz eclipse.platform.team-d2b1128544c91def401b4cd36b6fa833bcd5ab8f.zip | |
[Bug 77155] [Change Sets] Log entry fetch fails for two date tags
Diffstat (limited to 'bundles')
2 files changed, 5 insertions, 4 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RLog.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RLog.java index 7bf4135ac..fff45a343 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RLog.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RLog.java @@ -20,7 +20,8 @@ import org.eclipse.team.internal.ccvs.core.CVSTag; public class RLog extends RemoteCommand { /*** Local options: specific to rlog ***/ - public static final LocalOption NO_TAGS = new LocalOption("-N", null); //$NON-NLS-1$ + public static final LocalOption NO_TAGS = new LocalOption("-N"); //$NON-NLS-1$ //$NON-NLS-2$ + public static final LocalOption ONLY_INCLUDE_CHANGES = new LocalOption("-S"); //$NON-NLS-1$ //$NON-NLS-2$ /** * Makes a -r option for rlog. Here are the currently supported options: @@ -54,7 +55,7 @@ public class RLog extends RemoteCommand { if(date1.compareTo(date2) > 0) { operator = ">"; //$NON-NLS-1$ } - return new LocalOption("-d'" + tag1.getName() + "'"+ operator + "'" + tag2.getName() + "'", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + return new LocalOption("-d", tag1.getName() + operator + tag2.getName()); //$NON-NLS-1$ default: // Unknow tag type!!! throw new IllegalArgumentException(); 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 5018a29c7..b50aff5e5 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 @@ -214,9 +214,9 @@ public class RemoteLogOperation extends RepositoryLocationOperation { ICVSRemoteResource[] remotes = remoteResources; Command.LocalOption[] localOptions; if(tag1 != null && tag2 != null) { - localOptions = new Command.LocalOption[] {RLog.NO_TAGS, RLog.makeTagOption(tag1, tag2)}; + localOptions = new Command.LocalOption[] {RLog.NO_TAGS, RLog.ONLY_INCLUDE_CHANGES, RLog.makeTagOption(tag1, tag2)}; } else { - localOptions = new Command.LocalOption[] {RLog.NO_TAGS}; + localOptions = new Command.LocalOption[] {RLog.NO_TAGS, RLog.ONLY_INCLUDE_CHANGES}; // Optimize the cases were we are only fetching the history for a single revision. If it is // already cached, don't fetch it again. ArrayList unCachedRemotes = new ArrayList(); |