Login | Register
My pages Projects Community openCollabNet

Discussions > commits > subclipse svn commit: r5318 - trunk/subclipse/org.tigris.subversion.subclipse.core/src/org/tigris/subversion/subclipse/core: client commands

subclipse
Discussion topic

There will be a brief maintenance window every Friday at 17:00 Pacific.
For further details, see CollabNet's maintenance and upgrade policy.

Back to topic list

subclipse svn commit: r5318 - trunk/subclipse/org.tigris.subversion.subclipse.core/src/org/tigris/subversion/subclipse/core: client commands

Author selsemore
Full name Stephen Elsemore
Date 2012-03-05 13:11:32 PST
Message Author: selsemore
Date: 2012-03-05 13:11:31-0800
New Revision: 5318

Modified:
   trunk/subclipse/org.​tigris.subversion.su​bclipse.core/src/org​/tigris/subversion/s​ubclipse/core/client​/OperationResourceCo​llector.java
   trunk/subclipse/org.​tigris.subversion.su​bclipse.core/src/org​/tigris/subversion/s​ubclipse/core/comman​ds/UpdateResourcesCo​mmand.java

Log:
Don't do a refresh/status update on update if there are no changes.
Issue #: 1375


Modified: trunk/subclipse/org.​tigris.subversion.su​bclipse.core/src/org​/tigris/subversion/s​ubclipse/core/client​/OperationResourceCo​llector.java
Url: http://subclipse.tig​ris.org/source/brows​e/subclipse/trunk/su​bclipse/org.tigris.s​ubversion.subclipse.​core/src/org/tigris/​subversion/subclipse​/core/client/Operati​onResourceCollector.​java?view=diff&p​athrev=5318&r1=5​317&r2=5318
====================​====================​====================​==================
--- trunk/subclipse/org.​tigris.subversion.su​bclipse.core/src/org​/tigris/subversion/s​ubclipse/core/client​/OperationResourceCo​llector.java (original)
+++ trunk/subclipse/org.​tigris.subversion.su​bclipse.core/src/org​/tigris/subversion/s​ubclipse/core/client​/OperationResourceCo​llector.java 2012-03-05 13:11:31-0800
@@ -1,24 +1,56 @@
 package org.tigris.subversio​n.subclipse.core.cli​ent;
 
 import java.io.File;
+import java.util.HashMap;
 import java.util.LinkedHashSet;
+import java.util.Map;
 import java.util.Set;
 
 import org.eclipse.core.res​ources.IResource;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
+import org.tigris.subversio​n.subclipse.core.ISV​NLocalResource;
+import org.tigris.subversio​n.subclipse.core.SVN​Exception;
 import org.tigris.subversio​n.subclipse.core.res​ources.SVNWorkspaceR​oot;
 import org.tigris.subversio​n.svnclientadapter.I​SVNNotifyListener;
 import org.tigris.subversio​n.svnclientadapter.S​VNNodeKind;
+import org.tigris.subversio​n.svnclientadapter.S​VNRevision;
 
 public class OperationResourceCollector implements ISVNNotifyListener {
     private Set<IResource> operationResources = new LinkedHashSet<IRe​source>();
+ private boolean revisionUpdated = false;
+ private Map<String, SVNRevision> revisionMap = new HashMap<String, SVNRevision>();
     
     public void onNotify(File path, SVNNodeKind kind) {
         IPath pathEclipse = new Path(path.getAbsolutePath());
         IResource[] resources = SVNWorkspaceRoot.get​ResourcesFor(pathEcl​ipse, false);
         for (IResource resource : resources) {
             operationResources.a​dd(resource);
+
+ if (!revisionUpdated) {
+ ISVNLocalResource svnResource = SVNWorkspaceRoot.get​SVNResourceFor(resou​rce);
+ if (svnResource != null) {
+ try {
+ SVNRevision svnRevision = svnResource.getRevision();
+ if (svnRevision == null) {
+ revisionUpdated = true;
+ }
+ else {
+ SVNRevision previousRevision = revisionMap.get(path​.getAbsolutePath());​
+ if (previousRevision != null && !previousRevision.eq​uals(svnRevision)) {
+ revisionUpdated = true;
+ }
+ revisionMap.put(path​.getAbsolutePath(), svnRevision);
+ }
+ } catch (SVNException e) {
+ revisionUpdated = true;
+ }
+ }
+ else {
+ revisionUpdated = true;
+ }
+ }
+
         }
     }
     
@@ -29,7 +61,12 @@
     public void setCommand(int command) {}
     public void logCommandLine(String commandLine) {}
     public void logMessage(String message) {}
- public void logError(String message) {}
+ public void logError(String message) {}
     public void logRevision(long revision, String path) {}
     public void logCompleted(String message) {}
+
+ public boolean isRevisionUpdated() {
+ return revisionUpdated;
+ }
+
 }

Modified: trunk/subclipse/org.​tigris.subversion.su​bclipse.core/src/org​/tigris/subversion/s​ubclipse/core/comman​ds/UpdateResourcesCo​mmand.java
Url: http://subclipse.tig​ris.org/source/brows​e/subclipse/trunk/su​bclipse/org.tigris.s​ubversion.subclipse.​core/src/org/tigris/​subversion/subclipse​/core/commands/Updat​eResourcesCommand.ja​va?view=diff&pat​hrev=5318&r1=531​7&r2=5318
====================​====================​====================​==================
--- trunk/subclipse/org.​tigris.subversion.su​bclipse.core/src/org​/tigris/subversion/s​ubclipse/core/comman​ds/UpdateResourcesCo​mmand.java (original)
+++ trunk/subclipse/org.​tigris.subversion.su​bclipse.core/src/org​/tigris/subversion/s​ubclipse/core/comman​ds/UpdateResourcesCo​mmand.java 2012-03-05 13:11:31-0800
@@ -97,7 +97,12 @@
             throw SVNException.wrapException(e);
         } finally {
             Set<IResource> operationResources = operationResourceCol​lector.getOperationR​esources();
- OperationManager.get​Instance().endOperat​ion(true, operationResources);
+ if (operationResourceCo​llector.isRevisionUp​dated()) {
+ OperationManager.get​Instance().endOperat​ion(true, operationResources);
+ }
+ else {
+ OperationManager.get​Instance().endOperat​ion();
+ }
             if (conflictResolver != null) {
                 svnClient.addConflic​tResolutionCallback(​null);
             }

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

Subject
Author
Full name
Date posted
+
subclipse svn commit: r5318 - trunk/subclipse/org.tigris.subversion.subclipse.core/src/org/tigris/subversion/subclipse/core: client commands selsemore Stephen Elsemore 2012-03-05 13:11:32 PST
Messages per page: