< prev index next >

bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java

Print this page
*** 79,17 ***
                                                                 comments).stream()
                                                   .map(email -> Author.fromString(email.toString()))
                                                   .collect(Collectors.toList());
  
          var summary = Summary.summary(pr.repository().host().getCurrentUserDetails(), comments);
! 
!         var commitMessage = CommitMessage.title(isMerge ? "Merge" : pr.getTitle())
!                                          .contributors(additionalContributors)
                                           .reviewers(reviewers);
!         summary.ifPresent(commitMessage::summary);
  
!         return String.join("\n", commitMessage.format(CommitMessageFormatters.v1));
      }
  
      private Hash commitSquashed(List<Review> activeReviews, Namespace namespace, String censusDomain, String sponsorId) throws IOException {
          localRepo.checkout(baseHash, true);
          localRepo.squash(headHash);
--- 79,17 ---
                                                                 comments).stream()
                                                   .map(email -> Author.fromString(email.toString()))
                                                   .collect(Collectors.toList());
  
          var summary = Summary.summary(pr.repository().host().getCurrentUserDetails(), comments);
!         var issue = Issue.fromString(pr.getTitle());
!         var commitMessageBuilder = issue.map(CommitMessage::title).orElseGet(() -> CommitMessage.title(isMerge ? "Merge" : pr.getTitle()));
!         commitMessageBuilder.contributors(additionalContributors)
                                           .reviewers(reviewers);
!         summary.ifPresent(commitMessageBuilder::summary);
  
!         return String.join("\n", commitMessageBuilder.format(CommitMessageFormatters.v1));
      }
  
      private Hash commitSquashed(List<Review> activeReviews, Namespace namespace, String censusDomain, String sponsorId) throws IOException {
          localRepo.checkout(baseHash, true);
          localRepo.squash(headHash);
< prev index next >