From cb2c33d3bd9542a7ee3855a8551813dc8e85ce05 Mon Sep 17 00:00:00 2001
From: dklawren <dklawren@users.noreply.github.com>
Date: Tue, 27 Mar 2018 15:11:05 -0400
Subject: Bug 1440829 - Bugzilla comment for Phabricator commit should include
 entire commit message, not just first line

---
 extensions/PhabBugz/lib/Feed.pm     |  2 +-
 extensions/PhabBugz/lib/Revision.pm |  2 ++
 extensions/PhabBugz/lib/Util.pm     | 12 ++++++------
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'extensions')

diff --git a/extensions/PhabBugz/lib/Feed.pm b/extensions/PhabBugz/lib/Feed.pm
index 006ab04f3..bfd395f51 100644
--- a/extensions/PhabBugz/lib/Feed.pm
+++ b/extensions/PhabBugz/lib/Feed.pm
@@ -239,7 +239,7 @@ sub process_revision_change {
 
     my ($timestamp) = Bugzilla->dbh->selectrow_array("SELECT NOW()");
 
-    my $attachment = create_revision_attachment($bug, $revision->id, $revision->title, $timestamp);
+    my $attachment = create_revision_attachment($bug, $revision, $timestamp);
 
     # ATTACHMENT OBSOLETES
 
diff --git a/extensions/PhabBugz/lib/Revision.pm b/extensions/PhabBugz/lib/Revision.pm
index c114de78c..98c3196c2 100644
--- a/extensions/PhabBugz/lib/Revision.pm
+++ b/extensions/PhabBugz/lib/Revision.pm
@@ -29,6 +29,7 @@ use Bugzilla::Extension::PhabBugz::Util qw(
 has id               => ( is => 'ro',   isa => Int );
 has phid             => ( is => 'ro',   isa => Str );
 has title            => ( is => 'ro',   isa => Str );
+has summary          => ( is => 'ro',   isa => Str );
 has status           => ( is => 'ro',   isa => Str );
 has creation_ts      => ( is => 'ro',   isa => Str );
 has modification_ts  => ( is => 'ro',   isa => Str );
@@ -93,6 +94,7 @@ sub BUILDARGS {
     my ( $class, $params ) = @_;
 
     $params->{title}           = $params->{fields}->{title};
+    $params->{summary}         = $params->{fields}->{summary};
     $params->{status}          = $params->{fields}->{status}->{value};
     $params->{creation_ts}     = $params->{fields}->{dateCreated};
     $params->{modification_ts} = $params->{fields}->{dateModified};
diff --git a/extensions/PhabBugz/lib/Util.pm b/extensions/PhabBugz/lib/Util.pm
index 6c51df98c..52ea9c0d5 100644
--- a/extensions/PhabBugz/lib/Util.pm
+++ b/extensions/PhabBugz/lib/Util.pm
@@ -77,12 +77,12 @@ sub _get_revisions {
 }
 
 sub create_revision_attachment {
-    my ( $bug, $revision_id, $revision_title, $timestamp ) = @_;
+    my ( $bug, $revision, $timestamp ) = @_;
 
     my $phab_base_uri = Bugzilla->params->{phabricator_base_uri};
     ThrowUserError('invalid_phabricator_uri') unless $phab_base_uri;
 
-    my $revision_uri = $phab_base_uri . "D" . $revision_id;
+    my $revision_uri = $phab_base_uri . "D" . $revision->id;
 
     # Check for previous attachment with same revision id.
     # If one matches then return it instead. This is fine as
@@ -102,8 +102,8 @@ sub create_revision_attachment {
             bug         => $bug,
             creation_ts => $timestamp,
             data        => $revision_uri,
-            description => $revision_title,
-            filename    => 'phabricator-D' . $revision_id . '-url.txt',
+            description => $revision->title,
+            filename    => 'phabricator-D' . $revision->id . '-url.txt',
             ispatch     => 0,
             isprivate   => 0,
             mimetype    => PHAB_CONTENT_TYPE,
@@ -111,8 +111,8 @@ sub create_revision_attachment {
     );
 
     # Insert a comment about the new attachment into the database.
-    $bug->add_comment('', { type => CMT_ATTACHMENT_CREATED,
-                            extra_data => $attachment->id });
+    $bug->add_comment($revision->summary, { type       => CMT_ATTACHMENT_CREATED,
+                                            extra_data => $attachment->id });
 
     return $attachment;
 }
-- 
cgit v1.2.3-24-g4f1b