Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"

1 files changed, 9 insertions, 0 deletions

diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogFilterCollectionImpl.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogFilterCollectionImpl.java
index 285e3ce91079..3fbb7cb7b82f 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogFilterCollectionImpl.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogFilterCollectionImpl.java
@@ -27,17 +27,20 @@ public class VcsLogFilterCollectionImpl implements VcsLogFilterCollection {
 
   @Nullable private final VcsLogBranchFilter myBranchFilter;
   @Nullable private final VcsLogUserFilter myUserFilter;
+  @Nullable private final VcsLogHashFilter myHashFilter;
   @Nullable private final VcsLogDateFilter myDateFilter;
   @Nullable private final VcsLogTextFilter myTextFilter;
   @Nullable private final VcsLogStructureFilter myStructureFilter;
 
   public VcsLogFilterCollectionImpl(@Nullable VcsLogBranchFilter branchFilter,
                                     @Nullable VcsLogUserFilter userFilter,
+                                    @Nullable VcsLogHashFilter hashFilter,
                                     @Nullable VcsLogDateFilter dateFilter,
                                     @Nullable VcsLogTextFilter textFilter,
                                     @Nullable VcsLogStructureFilter structureFilter) {
     myBranchFilter = branchFilter;
     myUserFilter = userFilter;
+    myHashFilter = hashFilter;
     myDateFilter = dateFilter;
     myTextFilter = textFilter;
     myStructureFilter = structureFilter;
@@ -49,6 +52,12 @@ public class VcsLogFilterCollectionImpl implements VcsLogFilterCollection {
     return myBranchFilter;
   }
 
+  @Override
+  @Nullable
+  public VcsLogHashFilter getHashFilter() {
+    return myHashFilter;
+  }
+
   @Nullable
   @Override
   public VcsLogUserFilter getUserFilter() {