commit 428141251253438aeb51585907f87f7973a0b520
author Shawn O. Pearce <sop@google.com> Thu Jan 29 10:24:33 2009 -0800
committer Shawn O. Pearce <sop@google.com> Thu Jan 29 10:24:33 2009 -0800
tree 8942413a014a148c33af2fc1e2e1af087b5d934a
parent cff7c1dcc034fe54545349980f06b4bf2fffd2e6

Don't auto-approve changes when they are uploaded

The entire point of the code review systems is to have another
party beyond the uploader review the changes to determine they
are suitable for inclusion, and set the approval bits onto the
change record.  Automatically approving your own changes reduces
the value of this 3rd party review.

Bug: GERRIT-56
Signed-off-by: Shawn O. Pearce <sop@google.com>

appjar/src/main/java/com/google/gerrit/server/ssh/Receive.java

diff --git a/appjar/src/main/java/com/google/gerrit/server/ssh/Receive.java b/appjar/src/main/java/com/google/gerrit/server/ssh/Receive.java
index 13a5daf..701bd18 100644
--- a/appjar/src/main/java/com/google/gerrit/server/ssh/Receive.java
+++ b/appjar/src/main/java/com/google/gerrit/server/ssh/Receive.java
@@ -15,9 +15,9 @@
 package com.google.gerrit.server.ssh;
 
 import static com.google.gerrit.client.reviewdb.ApprovalCategory.PUSH_HEAD;
-import static com.google.gerrit.client.reviewdb.ApprovalCategory.PUSH_HEAD_UPDATE;
 import static com.google.gerrit.client.reviewdb.ApprovalCategory.PUSH_HEAD_CREATE;
 import static com.google.gerrit.client.reviewdb.ApprovalCategory.PUSH_HEAD_REPLACE;
+import static com.google.gerrit.client.reviewdb.ApprovalCategory.PUSH_HEAD_UPDATE;
 import static com.google.gerrit.client.reviewdb.ApprovalCategory.PUSH_TAG;
 
 import com.google.gerrit.client.Link;
@@ -26,7 +26,6 @@
 import com.google.gerrit.client.reviewdb.AccountAgreement;
 import com.google.gerrit.client.reviewdb.AccountExternalId;
 import com.google.gerrit.client.reviewdb.ApprovalCategory;
-import com.google.gerrit.client.reviewdb.ApprovalCategoryValue;
 import com.google.gerrit.client.reviewdb.Branch;
 import com.google.gerrit.client.reviewdb.Change;
 import com.google.gerrit.client.reviewdb.ChangeApproval;
@@ -611,14 +610,6 @@
     final Set<Account.Id> haveApprovals = new HashSet<Account.Id>();
     final List<ApprovalType> allTypes =
         Common.getGerritConfig().getApprovalTypes();
-    for (final ApprovalType t : allTypes) {
-      final ApprovalCategoryValue v = t.getMax();
-      if (v != null) {
-        db.changeApprovals().insert(
-            Collections.singleton(new ChangeApproval(new ChangeApproval.Key(
-                change.getId(), me, v.getCategoryId()), v.getValue())), txn);
-      }
-    }
     haveApprovals.add(me);
 
     if (allTypes.size() > 0) {
@@ -753,8 +744,6 @@
         boolean haveAuthor = false;
         boolean haveCommitter = false;
         final Set<Account.Id> haveApprovals = new HashSet<Account.Id>();
-        final Set<ApprovalCategory.Id> myApprovals =
-            new HashSet<ApprovalCategory.Id>();
         for (ChangeApproval a : db.changeApprovals().byChange(change.getId())) {
           haveApprovals.add(a.getAccountId());
           if (!haveAuthor && authorId != null
@@ -769,7 +758,6 @@
           if (me.equals(a.getAccountId())) {
             // Leave my own approvals alone.
             //
-            myApprovals.add(a.getCategoryId());
 
           } else if (a.getValue() > 0) {
             a.clear();
@@ -779,21 +767,6 @@
 
         final List<ApprovalType> allTypes =
             Common.getGerritConfig().getApprovalTypes();
-        for (final ApprovalType t : allTypes) {
-          final ApprovalCategoryValue max = t.getMax();
-          final ApprovalCategory.Id catId = t.getCategory().getId();
-          if (!myApprovals.contains(catId) && max != null) {
-            // Insert any approval I haven't earlier recorded, using the
-            // absolute maximum value, ignoring permissions. It truncates
-            // at display time and when the issue is closed.
-            //
-            haveApprovals.add(me);
-            db.changeApprovals().insert(
-                Collections.singleton(new ChangeApproval(
-                    new ChangeApproval.Key(change.getId(), me, catId), max
-                        .getValue())), txn);
-          }
-        }
         if (allTypes.size() > 0) {
           final ApprovalCategory.Id catId =
               allTypes.get(allTypes.size() - 1).getCategory().getId();