Merge branch 'loki/newlog'
authorKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Thu, 19 Sep 2013 15:07:24 +0000 (19:07 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Thu, 19 Sep 2013 15:07:24 +0000 (19:07 +0400)
Conflicts:
platform/platform-api/src/com/intellij/util/concurrency/QueueProcessor.java

1  2 
platform/dvcs/dvcs.iml
platform/platform-api/src/com/intellij/util/concurrency/QueueProcessor.java
platform/platform-resources-en/src/misc/registry.properties
platform/platform-resources/src/META-INF/VcsExtensionPoints.xml
plugins/git4idea/src/META-INF/plugin.xml
resources/src/idea/RichPlatformPlugin.xml

Simple merge
index 09935336949bd6e4abcf3b315e2fb9c923e1debf,b5f7eb16d4a4e7d3b2678f3654a3db3c65914e1e..4b52037463a1b40ebf8333579f969ae38bc8587f
@@@ -253,12 -253,17 +253,23 @@@ public class QueueProcessor<T> 
      }
    }
  
+   /**
+    * Removes several last tasks in the queue, leaving only {@code remaining} amount of them, counted from the head of the queue.
+    */
+   public void dismissLastTasks(int remaining) {
+     synchronized (myQueue) {
+       while (myQueue.size() > remaining) {
+         myQueue.pollLast();
+       }
+     }
+   }
 +  public boolean hasPendingItemsToProcess() {
 +    synchronized (myQueue) {
 +      return !myQueue.isEmpty();
 +    }
 +  }
 +
    private static class MyOverrideEquals {
      private final Object myDelegate;