don't attempt to diff svn items that are not diffable

rstudio · Dec 22, 2011 · 9c61d36 · 9c61d36
1 parent 237ce5f
commit 9c61d36
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/vcs/svn/dialog/SVNReviewPresenter.java b/src/gwt/src/org/rstudio/studio/client/workbench/views/vcs/svn/dialog/SVNReviewPresenter.java
@@ -60,6 +60,7 @@
 import org.rstudio.studio.client.workbench.views.vcs.svn.model.SVNState;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 
 public class SVNReviewPresenter implements ReviewPresenter
 {
@@ -160,6 +161,10 @@ public SVNReviewPresenter(SVNServerOperations server,
 
       binder.bind(commands, this);
 
+      undiffableStatuses_.add("?");
+      undiffableStatuses_.add("!");
+      undiffableStatuses_.add("X");
+
       commandHandler_ = new SVNCommandHandler(view, 
                                               globalDisplay, 
                                               commands, 
@@ -374,6 +379,10 @@ private void updateDiff()
          clearDiff();
          currentFilename_ = item.getPath();
       }
+
+      // bail if this is an undiffable status
+      if (undiffableStatuses_.contains(item.getStatus()))
+         return;
 
       diffInvalidation_.invalidate();
       final Token token = diffInvalidation_.getInvalidationToken();
@@ -491,6 +500,8 @@ public void onVcsPull()
    private boolean initialized_;
    private static final String MODULE_SVN = "vcs_svn";
    private static final String KEY_CONTEXT_LINES = "context_lines";
+
+   private final HashSet<String> undiffableStatuses_ = new HashSet<String>();
 
    private boolean overrideSizeWarning_ = false;