--- a/hgext/reviewboard/tests/test-auth.t
+++ b/hgext/reviewboard/tests/test-auth.t
@@ -111,17 +111,17 @@ Usernames for users without the IRC nick
     username: user1+8
 
 Newly created users should have a suitable profile (e.g. is_private is set)
 
   $ rbmanage dump-account-profile 'user1+8'
   collapsed_diffs: 1
   dashboard_columns: selected,new_updates,ship_it,my_comments,summary,submitter,last_updated_since
   default_use_rich_text: None
-  extra_data: {}
+  extra_data: {"show_archived": false}
   first_time_setup_done: 0
   group_columns: 
   id: 4
   is_private: 1
   open_an_issue: 1
   review_request_columns: 
   should_send_email: 1
   should_send_own_updates: 1

--- a/hgext/reviewboard/tests/test-commits-deleted-no-obsolescence.t
+++ b/hgext/reviewboard/tests/test-commits-deleted-no-obsolescence.t
@@ -114,16 +114,17 @@ Review request 6 should be added to the 
   bugs:
   - '1'
   commit: bz://1/mynick
   submitter: default+5
   summary: bz://1/mynick
   description: This is the parent review request
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.base_commit: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
     p2rb.commits: '[["6bd3fbee3dfaa83a6fe253b5a9bdc625a5d0be0e", 2], ["dfe48634934bd5d856a937479aadf54800c242c5",
       3], ["d751d4c04967ba4ec08425f618ba8d2c1b9d161a", 4], ["98dd6a7335dbea4bd3d2f2d1662fd6db45f1ddfb",
       5], ["76088734e3cba33be80930be14e7cd1e9ee474be", 6]]'
     p2rb.discard_on_publish_rids: '[6]'
     p2rb.first_public_ancestor: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
     p2rb.identifier: bz://1/mynick
@@ -135,16 +136,17 @@ Review request 6 should be added to the 
   draft:
     bugs:
     - '1'
     commit: bz://1/mynick
     summary: bz://1/mynick
     description: This is the parent review request
     target_people: []
     extra:
+      calculated_trophies: true
       p2rb: true
       p2rb.base_commit: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
       p2rb.commits: '[["6bd3fbee3dfaa83a6fe253b5a9bdc625a5d0be0e", 2], ["dfe48634934bd5d856a937479aadf54800c242c5",
         3], ["d751d4c04967ba4ec08425f618ba8d2c1b9d161a", 4], ["98dd6a7335dbea4bd3d2f2d1662fd6db45f1ddfb",
         5]]'
       p2rb.discard_on_publish_rids: '[]'
       p2rb.first_public_ancestor: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
       p2rb.identifier: bz://1/mynick
@@ -193,16 +195,17 @@ Review 6 should be marked as discarded
   bugs:
   - '1'
   commit: null
   submitter: default+5
   summary: Bug 1 - Foo 5
   description: Bug 1 - Foo 5
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: 76088734e3cba33be80930be14e7cd1e9ee474be
     p2rb.first_public_ancestor: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
 
@@ -248,31 +251,33 @@ The first commit was rewritten (we assum
   bugs:
   - '1'
   commit: null
   submitter: default+5
   summary: Bug 1 - Foo 1
   description: Bug 1 - Foo 1
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: 6bd3fbee3dfaa83a6fe253b5a9bdc625a5d0be0e
     p2rb.first_public_ancestor: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
   draft:
     bugs:
     - '1'
     commit: null
     summary: Bug 1 - Foo 2
     description: Bug 1 - Foo 2
     target_people: []
     extra:
+      calculated_trophies: true
       p2rb: true
       p2rb.commit_id: 7050183d97d5f601da86fb313dd8783ccf1ade18
       p2rb.first_public_ancestor: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
       p2rb.identifier: bz://1/mynick
       p2rb.is_squashed: false
     diffs:
     - id: 9
       revision: 2
@@ -297,16 +302,17 @@ request is published.
   bugs:
   - '1'
   commit: bz://1/mynick
   submitter: default+5
   summary: bz://1/mynick
   description: This is the parent review request
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.base_commit: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
     p2rb.commits: '[["6bd3fbee3dfaa83a6fe253b5a9bdc625a5d0be0e", 2], ["dfe48634934bd5d856a937479aadf54800c242c5",
       3], ["d751d4c04967ba4ec08425f618ba8d2c1b9d161a", 4], ["98dd6a7335dbea4bd3d2f2d1662fd6db45f1ddfb",
       5]]'
     p2rb.discard_on_publish_rids: '[5]'
     p2rb.first_public_ancestor: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
     p2rb.identifier: bz://1/mynick
@@ -318,16 +324,17 @@ request is published.
   draft:
     bugs:
     - '1'
     commit: bz://1/mynick
     summary: bz://1/mynick
     description: This is the parent review request
     target_people: []
     extra:
+      calculated_trophies: true
       p2rb: true
       p2rb.base_commit: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
       p2rb.commits: '[["7050183d97d5f601da86fb313dd8783ccf1ade18", 2], ["d7a5827a584db609f6a9ca2bd3d43aa3afa6b86e",
         3], ["b5473ad606f40840715d6b378dacc1a37f6263b1", 4]]'
       p2rb.discard_on_publish_rids: '[]'
       p2rb.first_public_ancestor: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
       p2rb.identifier: bz://1/mynick
       p2rb.is_squashed: true

--- a/hgext/reviewboard/tests/test-commits-deleted-obsolescence.t
+++ b/hgext/reviewboard/tests/test-commits-deleted-obsolescence.t
@@ -120,16 +120,17 @@ on publish.
   bugs:
   - '1'
   commit: bz://1/mynick
   submitter: default+5
   summary: bz://1/mynick
   description: This is the parent review request
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.base_commit: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
     p2rb.commits: '[["6bd3fbee3dfaa83a6fe253b5a9bdc625a5d0be0e", 2], ["dfe48634934bd5d856a937479aadf54800c242c5",
       3], ["d751d4c04967ba4ec08425f618ba8d2c1b9d161a", 4], ["98dd6a7335dbea4bd3d2f2d1662fd6db45f1ddfb",
       5], ["76088734e3cba33be80930be14e7cd1e9ee474be", 6]]'
     p2rb.discard_on_publish_rids: '[6]'
     p2rb.first_public_ancestor: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
     p2rb.identifier: bz://1/mynick
@@ -141,16 +142,17 @@ on publish.
   draft:
     bugs:
     - '1'
     commit: bz://1/mynick
     summary: bz://1/mynick
     description: This is the parent review request
     target_people: []
     extra:
+      calculated_trophies: true
       p2rb: true
       p2rb.base_commit: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
       p2rb.commits: '[["6bd3fbee3dfaa83a6fe253b5a9bdc625a5d0be0e", 2], ["dfe48634934bd5d856a937479aadf54800c242c5",
         3], ["d751d4c04967ba4ec08425f618ba8d2c1b9d161a", 4], ["98dd6a7335dbea4bd3d2f2d1662fd6db45f1ddfb",
         5]]'
       p2rb.discard_on_publish_rids: '[]'
       p2rb.first_public_ancestor: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
       p2rb.identifier: bz://1/mynick
@@ -199,16 +201,17 @@ The parent review should have dropped th
   bugs:
   - '1'
   commit: bz://1/mynick
   submitter: default+5
   summary: bz://1/mynick
   description: This is the parent review request
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.base_commit: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
     p2rb.commits: '[["6bd3fbee3dfaa83a6fe253b5a9bdc625a5d0be0e", 2], ["dfe48634934bd5d856a937479aadf54800c242c5",
       3], ["d751d4c04967ba4ec08425f618ba8d2c1b9d161a", 4], ["98dd6a7335dbea4bd3d2f2d1662fd6db45f1ddfb",
       5]]'
     p2rb.discard_on_publish_rids: '[]'
     p2rb.first_public_ancestor: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
     p2rb.identifier: bz://1/mynick
@@ -227,16 +230,17 @@ Review 6 should be marked as discarded
   bugs:
   - '1'
   commit: null
   submitter: default+5
   summary: Bug 1 - Foo 5
   description: Bug 1 - Foo 5
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: 76088734e3cba33be80930be14e7cd1e9ee474be
     p2rb.first_public_ancestor: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
 
@@ -281,16 +285,17 @@ on publish.
   bugs:
   - '1'
   commit: bz://1/mynick
   submitter: default+5
   summary: bz://1/mynick
   description: This is the parent review request
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.base_commit: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
     p2rb.commits: '[["6bd3fbee3dfaa83a6fe253b5a9bdc625a5d0be0e", 2], ["dfe48634934bd5d856a937479aadf54800c242c5",
       3], ["d751d4c04967ba4ec08425f618ba8d2c1b9d161a", 4], ["98dd6a7335dbea4bd3d2f2d1662fd6db45f1ddfb",
       5]]'
     p2rb.discard_on_publish_rids: '[2]'
     p2rb.first_public_ancestor: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
     p2rb.identifier: bz://1/mynick
@@ -302,16 +307,17 @@ on publish.
   draft:
     bugs:
     - '1'
     commit: bz://1/mynick
     summary: bz://1/mynick
     description: This is the parent review request
     target_people: []
     extra:
+      calculated_trophies: true
       p2rb: true
       p2rb.base_commit: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
       p2rb.commits: '[["7050183d97d5f601da86fb313dd8783ccf1ade18", 3], ["d7a5827a584db609f6a9ca2bd3d43aa3afa6b86e",
         4], ["b5473ad606f40840715d6b378dacc1a37f6263b1", 5]]'
       p2rb.discard_on_publish_rids: '[]'
       p2rb.first_public_ancestor: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
       p2rb.identifier: bz://1/mynick
       p2rb.is_squashed: true
@@ -353,16 +359,17 @@ The dropped commit should now be discard
   bugs:
   - '1'
   commit: null
   submitter: default+5
   summary: Bug 1 - Foo 1
   description: Bug 1 - Foo 1
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: 6bd3fbee3dfaa83a6fe253b5a9bdc625a5d0be0e
     p2rb.first_public_ancestor: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
 
@@ -403,16 +410,17 @@ The parent review should have been updat
   bugs:
   - '1'
   commit: bz://1/mynick
   submitter: default+5
   summary: bz://1/mynick
   description: This is the parent review request
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.base_commit: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
     p2rb.commits: '[["7050183d97d5f601da86fb313dd8783ccf1ade18", 3], ["2fbc30f77859fa4be2e173866fa71c52d394f2c4",
       5]]'
     p2rb.discard_on_publish_rids: '[]'
     p2rb.first_public_ancestor: 93d9429b41ecf0d2ad8c62b6ea26686dd20330f4
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: true

--- a/hgext/reviewboard/tests/test-operation-prevention.t
+++ b/hgext/reviewboard/tests/test-operation-prevention.t
@@ -39,16 +39,17 @@ Publishing the parent should succeed.
   bugs:
   - '1'
   commit: bz://1/mynick
   submitter: author+6
   summary: bz://1/mynick
   description: This is the parent review request
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.base_commit: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.commits: '[["86a712c7f0187fed4c00b99131838610c76e6cc0", 2]]'
     p2rb.discard_on_publish_rids: '[]'
     p2rb.first_public_ancestor: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: true
     p2rb.reviewer_map: '{"2": []}'
@@ -63,16 +64,17 @@ Publishing the parent should succeed.
   bugs:
   - '1'
   commit: null
   submitter: author+6
   summary: Bug 1 - Initial commit to review
   description: Bug 1 - Initial commit to review
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: 86a712c7f0187fed4c00b99131838610c76e6cc0
     p2rb.first_public_ancestor: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
 

--- a/hgext/reviewboard/tests/test-push-http.t
+++ b/hgext/reviewboard/tests/test-push-http.t
@@ -340,16 +340,17 @@ Test creating a review via HTTP
   - '1'
   commit: bz://1/mynick
   submitter: user2
   summary: bz://1/mynick
   description: This is the parent review request
   target_people:
   - reviewer
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.base_commit: 6432ccd4579e0fdc337b6dc55b827cbcc7fee397
     p2rb.commits: '[["9a6457fbda8fb4e5afaa3e0ab831f34a3de285af", 2], ["b41b3bd650cb5b456e611e2eeb77705e4c41cb83",
       3]]'
     p2rb.discard_on_publish_rids: '[]'
     p2rb.first_public_ancestor: 6432ccd4579e0fdc337b6dc55b827cbcc7fee397
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: true

--- a/hgext/reviewboard/tests/test-review-request-approval.t
+++ b/hgext/reviewboard/tests/test-review-request-approval.t
@@ -49,16 +49,17 @@ Create a review request from an L1 user
   commit: null
   submitter: level1a
   summary: Bug 1 - Initial commit to review
   description: Bug 1 - Initial commit to review
   target_people:
   - level1b
   - level3
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: 86a712c7f0187fed4c00b99131838610c76e6cc0
     p2rb.first_public_ancestor: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
 
@@ -76,16 +77,17 @@ Have an L1 user provide a ship it review
   commit: null
   submitter: level1a
   summary: Bug 1 - Initial commit to review
   description: Bug 1 - Initial commit to review
   target_people:
   - level1b
   - level3
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: 86a712c7f0187fed4c00b99131838610c76e6cc0
     p2rb.first_public_ancestor: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
   review_count: 1
@@ -111,16 +113,17 @@ Have an L3 user provide a ship it review
   commit: null
   submitter: level1a
   summary: Bug 1 - Initial commit to review
   description: Bug 1 - Initial commit to review
   target_people:
   - level1b
   - level3
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: 86a712c7f0187fed4c00b99131838610c76e6cc0
     p2rb.first_public_ancestor: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: true
   approval_failure: null
   review_count: 2
@@ -150,16 +153,17 @@ Posting a new review without ship it sho
   commit: null
   submitter: level1a
   summary: Bug 1 - Initial commit to review
   description: Bug 1 - Initial commit to review
   target_people:
   - level1b
   - level3
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: 86a712c7f0187fed4c00b99131838610c76e6cc0
     p2rb.first_public_ancestor: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
   review_count: 3
@@ -196,16 +200,17 @@ One more ship it should switch it back t
   commit: null
   submitter: level1a
   summary: Bug 1 - Initial commit to review
   description: Bug 1 - Initial commit to review
   target_people:
   - level1b
   - level3
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: 86a712c7f0187fed4c00b99131838610c76e6cc0
     p2rb.first_public_ancestor: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: true
   approval_failure: null
   review_count: 4
@@ -250,16 +255,17 @@ Since the author is L1, adding a new dif
   commit: null
   submitter: level1a
   summary: Bug 1 - Initial commit to review
   description: Bug 1 - Initial commit to review
   target_people:
   - level1b
   - level3
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: 473206d1f704058758360f38c6fbf9c557bac746
     p2rb.first_public_ancestor: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
   review_count: 4
@@ -302,16 +308,17 @@ A new ship-it from L3 should give approv
   commit: null
   submitter: level1a
   summary: Bug 1 - Initial commit to review
   description: Bug 1 - Initial commit to review
   target_people:
   - level1b
   - level3
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: 473206d1f704058758360f38c6fbf9c557bac746
     p2rb.first_public_ancestor: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: true
   approval_failure: null
   review_count: 5
@@ -365,16 +372,17 @@ Opening issues, even from an L1 user, sh
   commit: null
   submitter: level1a
   summary: Bug 1 - Initial commit to review
   description: Bug 1 - Initial commit to review
   target_people:
   - level1b
   - level3
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: 473206d1f704058758360f38c6fbf9c557bac746
     p2rb.first_public_ancestor: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: The review request has open issues.
   review_count: 6
@@ -441,16 +449,17 @@ Fixing the issue should restore approval
   commit: null
   submitter: level1a
   summary: Bug 1 - Initial commit to review
   description: Bug 1 - Initial commit to review
   target_people:
   - level1b
   - level3
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: 473206d1f704058758360f38c6fbf9c557bac746
     p2rb.first_public_ancestor: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: true
   approval_failure: null
   review_count: 6
@@ -525,16 +534,17 @@ Review requests created by L3 users
   commit: null
   submitter: level3
   summary: Bug 2 - initial commit to review
   description: Bug 2 - initial commit to review
   target_people:
   - level1a
   - level1b
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: c1ebcda638274d5217801b7f05e33b848ff39be1
     p2rb.first_public_ancestor: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.identifier: bz://2/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
 
@@ -552,16 +562,17 @@ Even a ship-it from an L1 user will give
   commit: null
   submitter: level3
   summary: Bug 2 - initial commit to review
   description: Bug 2 - initial commit to review
   target_people:
   - level1a
   - level1b
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: c1ebcda638274d5217801b7f05e33b848ff39be1
     p2rb.first_public_ancestor: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.identifier: bz://2/mynick
     p2rb.is_squashed: false
   approved: true
   approval_failure: null
   review_count: 1
@@ -590,16 +601,17 @@ ship-its. Posting a new diff should not 
   commit: null
   submitter: level3
   summary: Bug 2 - initial commit to review
   description: Bug 2 - initial commit to review
   target_people:
   - level1a
   - level1b
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: bccc4c4e590eeefbb42491f1bb061143a49bdaf8
     p2rb.first_public_ancestor: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.identifier: bz://2/mynick
     p2rb.is_squashed: false
   approved: true
   approval_failure: null
   review_count: 1

--- a/hgext/reviewboard/tests/test-review-request-closed-discarded.t
+++ b/hgext/reviewboard/tests/test-review-request-closed-discarded.t
@@ -118,16 +118,17 @@ no Commit ID set.
   bugs:
   - '1'
   commit: null
   submitter: default+5
   summary: bz://1/mynick
   description: This is the parent review request
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.base_commit: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.commits: '[["a92d53c0ffc7df0517397a77980e62332552d812", 2], ["233b570e5356d0c84bcbf0633de446172012b3b3",
       3]]'
     p2rb.discard_on_publish_rids: '[]'
     p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: true
@@ -145,16 +146,17 @@ Child review request with ID 2 should be
   bugs:
   - '1'
   commit: null
   submitter: default+5
   summary: Bug 1 - Foo 1
   description: Bug 1 - Foo 1
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: a92d53c0ffc7df0517397a77980e62332552d812
     p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
 
@@ -167,16 +169,17 @@ Child review request with ID 3 should be
   bugs:
   - '1'
   commit: null
   submitter: default+5
   summary: Bug 1 - Foo 2
   description: Bug 1 - Foo 2
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: 233b570e5356d0c84bcbf0633de446172012b3b3
     p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
 
@@ -253,16 +256,17 @@ Commit ID re-instated.
   bugs:
   - '1'
   commit: bz://1/mynick
   submitter: default+5
   summary: bz://1/mynick
   description: This is the parent review request
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.base_commit: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.commits: '[["a92d53c0ffc7df0517397a77980e62332552d812", 2], ["233b570e5356d0c84bcbf0633de446172012b3b3",
       3]]'
     p2rb.discard_on_publish_rids: '[]'
     p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: true
@@ -273,16 +277,17 @@ Commit ID re-instated.
   draft:
     bugs:
     - '1'
     commit: bz://1/mynick
     summary: bz://1/mynick
     description: This is the parent review request
     target_people: []
     extra:
+      calculated_trophies: true
       p2rb: true
       p2rb.base_commit: 7c5bdf0cec4a90edb36300f8f3679857f46db829
       p2rb.commits: '[["a92d53c0ffc7df0517397a77980e62332552d812", 2], ["233b570e5356d0c84bcbf0633de446172012b3b3",
         3]]'
       p2rb.discard_on_publish_rids: '[]'
       p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
       p2rb.identifier: bz://1/mynick
       p2rb.is_squashed: true
@@ -299,31 +304,33 @@ Child review request with ID 2 should be
   bugs:
   - '1'
   commit: null
   submitter: default+5
   summary: Bug 1 - Foo 1
   description: Bug 1 - Foo 1
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: a92d53c0ffc7df0517397a77980e62332552d812
     p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: The review request is not public.
   draft:
     bugs:
     - '1'
     commit: null
     summary: Bug 1 - Foo 1
     description: Bug 1 - Foo 1
     target_people: []
     extra:
+      calculated_trophies: true
       p2rb: true
       p2rb.commit_id: a92d53c0ffc7df0517397a77980e62332552d812
       p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
       p2rb.identifier: bz://1/mynick
       p2rb.is_squashed: false
     diffs: []
 
 Child review request with ID 3 should be re-opened...
@@ -335,31 +342,33 @@ Child review request with ID 3 should be
   bugs:
   - '1'
   commit: null
   submitter: default+5
   summary: Bug 1 - Foo 2
   description: Bug 1 - Foo 2
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: 233b570e5356d0c84bcbf0633de446172012b3b3
     p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: The review request is not public.
   draft:
     bugs:
     - '1'
     commit: null
     summary: Bug 1 - Foo 2
     description: Bug 1 - Foo 2
     target_people: []
     extra:
+      calculated_trophies: true
       p2rb: true
       p2rb.commit_id: 233b570e5356d0c84bcbf0633de446172012b3b3
       p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
       p2rb.identifier: bz://1/mynick
       p2rb.is_squashed: false
     diffs: []
 
 There should still not be a visible attachment on the bug
@@ -434,16 +443,17 @@ Squashed review request should be publis
   bugs:
   - '1'
   commit: bz://1/mynick
   submitter: default+5
   summary: bz://1/mynick
   description: This is the parent review request
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.base_commit: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.commits: '[["a92d53c0ffc7df0517397a77980e62332552d812", 2], ["233b570e5356d0c84bcbf0633de446172012b3b3",
       3]]'
     p2rb.discard_on_publish_rids: '[]'
     p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: true
@@ -461,16 +471,17 @@ Child review request with ID 2 should be
   bugs:
   - '1'
   commit: null
   submitter: default+5
   summary: Bug 1 - Foo 1
   description: Bug 1 - Foo 1
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: a92d53c0ffc7df0517397a77980e62332552d812
     p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
 
@@ -483,16 +494,17 @@ Child review request with ID 3 should be
   bugs:
   - '1'
   commit: null
   submitter: default+5
   summary: Bug 1 - Foo 2
   description: Bug 1 - Foo 2
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: 233b570e5356d0c84bcbf0633de446172012b3b3
     p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
 

--- a/hgext/reviewboard/tests/test-review-request-closed-submitted.t
+++ b/hgext/reviewboard/tests/test-review-request-closed-submitted.t
@@ -62,16 +62,17 @@ Squashed review request with ID 1 should
   bugs:
   - '1'
   commit: bz://1/mynick
   submitter: default+5
   summary: bz://1/mynick
   description: This is the parent review request
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.base_commit: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.commits: '[["a92d53c0ffc7df0517397a77980e62332552d812", 2], ["233b570e5356d0c84bcbf0633de446172012b3b3",
       3]]'
     p2rb.discard_on_publish_rids: '[]'
     p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: true
@@ -89,16 +90,17 @@ Child review request with ID 2 should be
   bugs:
   - '1'
   commit: null
   submitter: default+5
   summary: Bug 1 - Foo 1
   description: Bug 1 - Foo 1
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: a92d53c0ffc7df0517397a77980e62332552d812
     p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
 
@@ -109,16 +111,17 @@ Child review request with ID 2 should be
   bugs:
   - '1'
   commit: null
   submitter: default+5
   summary: Bug 1 - Foo 2
   description: Bug 1 - Foo 2
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: 233b570e5356d0c84bcbf0633de446172012b3b3
     p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
 
@@ -135,16 +138,17 @@ Squashed review request with ID 1 should
   bugs:
   - '1'
   commit: bz://1/mynick
   submitter: default+5
   summary: bz://1/mynick
   description: This is the parent review request
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.base_commit: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.commits: '[["a92d53c0ffc7df0517397a77980e62332552d812", 2], ["233b570e5356d0c84bcbf0633de446172012b3b3",
       3]]'
     p2rb.discard_on_publish_rids: '[]'
     p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: true
@@ -162,16 +166,17 @@ Child review request with ID 2 should be
   bugs:
   - '1'
   commit: null
   submitter: default+5
   summary: Bug 1 - Foo 1
   description: Bug 1 - Foo 1
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: a92d53c0ffc7df0517397a77980e62332552d812
     p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
 
@@ -184,16 +189,17 @@ Child review request with ID 3 should be
   bugs:
   - '1'
   commit: null
   submitter: default+5
   summary: Bug 1 - Foo 2
   description: Bug 1 - Foo 2
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: 233b570e5356d0c84bcbf0633de446172012b3b3
     p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
 

--- a/hgext/reviewboard/tests/test-review-request-delete-draft.t
+++ b/hgext/reviewboard/tests/test-review-request-delete-draft.t
@@ -71,16 +71,17 @@ We should have a disagreement between pu
   bugs:
   - '1'
   commit: bz://1/mynick
   submitter: submitter+6
   summary: bz://1/mynick
   description: This is the parent review request
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.base_commit: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.commits: '[["0aca5e4417025c80407d8f7f22864e8d09fbec50", 2]]'
     p2rb.discard_on_publish_rids: '[]'
     p2rb.first_public_ancestor: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: true
     p2rb.reviewer_map: '{}'
@@ -90,16 +91,17 @@ We should have a disagreement between pu
   draft:
     bugs:
     - '1'
     commit: bz://1/mynick
     summary: bz://1/mynick
     description: This is the parent review request
     target_people: []
     extra:
+      calculated_trophies: true
       p2rb: true
       p2rb.base_commit: 3a9f6899ef84c99841f546030b036d0124a863cf
       p2rb.commits: '[["b3be3d464d6b32130006cbdfa82f9f98a3c57a01", 2]]'
       p2rb.discard_on_publish_rids: '[]'
       p2rb.first_public_ancestor: 3a9f6899ef84c99841f546030b036d0124a863cf
       p2rb.identifier: bz://1/mynick
       p2rb.is_squashed: true
       p2rb.reviewer_map: '{"2": []}'
@@ -124,31 +126,33 @@ We should have a disagreement between pu
   bugs:
   - '1'
   commit: null
   submitter: submitter+6
   summary: Bug 1 - Initial commit
   description: Bug 1 - Initial commit
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: 0aca5e4417025c80407d8f7f22864e8d09fbec50
     p2rb.first_public_ancestor: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
   draft:
     bugs:
     - '1'
     commit: null
     summary: Bug 1 - Initial commit
     description: Bug 1 - Initial commit
     target_people: []
     extra:
+      calculated_trophies: true
       p2rb: true
       p2rb.commit_id: b3be3d464d6b32130006cbdfa82f9f98a3c57a01
       p2rb.first_public_ancestor: 3a9f6899ef84c99841f546030b036d0124a863cf
       p2rb.identifier: bz://1/mynick
       p2rb.is_squashed: false
     diffs:
     - id: 4
       revision: 2
@@ -174,16 +178,17 @@ Discarding the parent review request dra
   bugs:
   - '1'
   commit: bz://1/mynick
   submitter: submitter+6
   summary: bz://1/mynick
   description: This is the parent review request
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.base_commit: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.commits: '[["0aca5e4417025c80407d8f7f22864e8d09fbec50", 2]]'
     p2rb.discard_on_publish_rids: '[]'
     p2rb.first_public_ancestor: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: true
     p2rb.reviewer_map: '{}'
@@ -198,16 +203,17 @@ Discarding the parent review request dra
   bugs:
   - '1'
   commit: null
   submitter: submitter+6
   summary: Bug 1 - Initial commit
   description: Bug 1 - Initial commit
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: 0aca5e4417025c80407d8f7f22864e8d09fbec50
     p2rb.first_public_ancestor: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
 

--- a/hgext/reviewboard/tests/test-specify-reviewers.t
+++ b/hgext/reviewboard/tests/test-specify-reviewers.t
@@ -216,16 +216,17 @@ Publishing series during push works
   commit: null
   submitter: default+5
   summary: Bug 1 - More stuff; [r?remus, r?romulus]
   description: Bug 1 - More stuff; [r?remus, r?romulus]
   target_people:
   - remus
   - romulus
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: 2bc874a070cef1ff62b63e28f3d40a81655fec77
     p2rb.first_public_ancestor: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
 

--- a/hgext/reviewboard/tests/test-unicode.t
+++ b/hgext/reviewboard/tests/test-unicode.t
@@ -42,16 +42,17 @@ The globbing is patching over a bug in m
   bugs:
   - '1'
   commit: null
   submitter: author+6
   summary: "Bug 1 - Initial commit to review \u2019 \u3053"
   description: "Bug 1 - Initial commit to review \u2019 \u3053"
   target_people: []
   extra_data:
+    calculated_trophies: true
     p2rb: true
     p2rb.commit_id: f03366314c7798387fcd3e367afaa6ba472feb5d
     p2rb.first_public_ancestor: 3a9f6899ef84c99841f546030b036d0124a863cf
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"