Page MenuHomePhabricator
Files F13179532

D17146.diff
No OneTemporary
Actions

D17146.diff
View Options

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -7,6 +7,7 @@
private $isCloseByCommit;
private $repositoryPHIDOverride = false;
private $didExpandInlineState = false;
+ private $hasReviewTransaction = false;
private $affectedPaths;
public function getEditorApplicationClass() {
@@ -261,13 +262,20 @@
PhabricatorLiskDAO $object,
array $xactions) {
- // If we have an "Inline State" transaction already, the caller built it
- // for us so we don't need to expand it again.
foreach ($xactions as $xaction) {
switch ($xaction->getTransactionType()) {
case PhabricatorTransactions::TYPE_INLINESTATE:
+ // If we have an "Inline State" transaction already, the caller
+ // built it for us so we don't need to expand it again.
$this->didExpandInlineState = true;
break;
+ case DifferentialRevisionAcceptTransaction::TRANSACTIONTYPE:
+ case DifferentialRevisionRejectTransaction::TRANSACTIONTYPE:
+ case DifferentialRevisionResignTransaction::TRANSACTIONTYPE:
+ // If we have a review transaction, we'll skip marking the user
+ // as "Commented" later. This should get cleaner after T10967.
+ $this->hasReviewTransaction = true;
+ break;
}
}
@@ -426,6 +434,11 @@
// "added" to "commented" if they're also a reviewer. We may further
// upgrade this based on other actions in the transaction group.
+ if ($this->hasReviewTransaction) {
+ // If we're also applying a review transaction, skip this.
+ break;
+ }
+
$status_added = DifferentialReviewerStatus::STATUS_ADDED;
$status_commented = DifferentialReviewerStatus::STATUS_COMMENTED;

File Metadata

Mime Type
text/plain
Expires
Thu, May 9, 9:15 PM (3 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6277730
Default Alt Text
D17146.diff (1 KB)

Event Timeline

Phabricator · Built by Phacility