From 0959bf83581529bd622cd4e078712b587e39f8bb Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Thu, 29 Nov 2012 10:31:31 +0100
Subject: [PATCH] IDEA-96147 DirDiff doesn't update diff panel on enter (cherry
 picked from commit 0964928178375a73c5b60dbdf88db9697f98a99c)

---
 .../com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java  | 1 +
 .../intellij/openapi/diff/impl/dir/actions/DirDiffAction.java  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java
index 3ea7d98e6033..6a946aa00435 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java
@@ -156,6 +156,7 @@ public class DirDiffTableModel extends AbstractTableModel implements DirDiffMode
 
   public void updateFromUI() {
     getSettings().setFilter(myPanel.getFilter());
+    myPanel.update(false);
   }
 
   public boolean isOperationsEnabled() {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/actions/DirDiffAction.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/actions/DirDiffAction.java
index 6732f1b048cd..15f54bac0ec0 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/actions/DirDiffAction.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/actions/DirDiffAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,6 +53,7 @@ public abstract class DirDiffAction extends ToggleAction implements ShortcutProv
         }
       }
     }
+    getModel().updateFromUI();
   }
 
   protected boolean isFullReload() {