// Copyright (C) 2015 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package com.google.gerrit.server.query.change;

import static com.google.gerrit.server.index.change.ChangeField.COMMIT;
import static com.google.gerrit.server.index.change.ChangeField.EXACT_COMMIT;

import com.google.gerrit.git.ObjectIds;
import com.google.gerrit.index.FieldDef;
import com.google.gerrit.reviewdb.client.PatchSet;

public class CommitPredicate extends ChangeIndexPredicate {
  static FieldDef<ChangeData, ?> commitField(String id) {
    if (id.length() == ObjectIds.STR_LEN) {
      return EXACT_COMMIT;
    }
    return COMMIT;
  }

  public CommitPredicate(String id) {
    super(commitField(id), id);
  }

  @Override
  public boolean match(ChangeData object) {
    String id = getValue().toLowerCase();
    for (PatchSet p : object.patchSets()) {
      if (equals(p, id)) {
        return true;
      }
    }
    return false;
  }

  protected boolean equals(PatchSet p, String id) {
    boolean exact = getField() == EXACT_COMMIT;
    String rev = p.getCommitId().name();
    return (exact && id.equals(rev)) || (!exact && rev.startsWith(id));
  }

  @Override
  public int getCost() {
    return 1;
  }
}

@@ -650,16 +650,83 @@
 hange;%0A%0A
+import static com.google.gerrit.git.ObjectIds.matchesAbbreviation;%0A
 import s
@@ -1582,24 +1582,12 @@
     
-boolean exact = 
+if (
 getF
@@ -1612,26 +1612,24 @@
 MMIT
-;
+) %7B
 %0A    
-String rev =
+  return
  p.g
@@ -1651,80 +1651,78 @@
 me()
-;%0A    return (exact && id.equals(rev)) %7C%7C (!exact && rev.startsWith(
+.equals(id);%0A    %7D%0A    return matchesAbbreviation(p.getCommitId(), 
 id)
-)
 ;%0A  

Clarify logic in equals