Page MenuHomePhabricator
Files F15464202

D12492.diff
No OneTemporary
Actions

D12492.diff
View Options

diff --git a/src/infrastructure/diff/PhabricatorInlineCommentController.php b/src/infrastructure/diff/PhabricatorInlineCommentController.php
--- a/src/infrastructure/diff/PhabricatorInlineCommentController.php
+++ b/src/infrastructure/diff/PhabricatorInlineCommentController.php
@@ -206,21 +206,21 @@
$edit_dialog = $this->buildEditDialog();
if ($this->getOperation() == 'reply') {
- $inline = $this->loadComment($this->getCommentID());
-
$edit_dialog->setTitle(pht('Reply to Inline Comment'));
- $changeset = $inline->getChangesetID();
- $is_new = $inline->getIsNewFile();
- $number = $inline->getLineNumber();
- $length = $inline->getLineLength();
} else {
$edit_dialog->setTitle(pht('New Inline Comment'));
- $changeset = $this->getChangesetID();
- $is_new = $this->getIsNewFile();
- $number = $this->getLineNumber();
- $length = $this->getLineLength();
}
+ // NOTE: We read the values from the client (the display values), not
+ // the values from the database (the original values) when replying.
+ // In particular, when replying to a ghost comment which was moved
+ // across diffs and then moved backward to the most recent visible
+ // line, we want to reply on the display line (which exists), not on
+ // the comment's original line (which may not exist in this changeset).
+ $is_new = $this->getIsNewFile();
+ $number = $this->getLineNumber();
+ $length = $this->getLineLength();
+
$edit_dialog->addHiddenInput('op', 'create');
$edit_dialog->addHiddenInput('is_new', $is_new);
$edit_dialog->addHiddenInput('number', $number);
@@ -261,14 +261,11 @@
pht('Failed to load comment "%s".', $reply_phid));
}
- if ($reply_comment->getChangesetID() != $this->getChangesetID()) {
- throw new Exception(
- pht(
- 'Comment "%s" belongs to wrong changeset (%s vs %s).',
- $reply_phid,
- $reply_comment->getChangesetID(),
- $this->getChangesetID()));
- }
+ // NOTE: It's fine to reply to a comment from a different changeset, so
+ // the reply comment may not appear on the same changeset that the new
+ // comment appears on. This is expected in the case of ghost comments.
+ // We currently put the new comment on the visible changeset, not the
+ // original comment's changeset.
}
}

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 3, 7:15 AM (2 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7505240
Default Alt Text
D12492.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility