@@ -336,8 +336,9 @@ public String getRepoUrl() {
336336 return repo .getRepoUrl ();
337337 }
338338
339- private void fillUnifiedDiffs (final String srcBranchName , final String dstBranchName , List <VCSDiffEntry > entries )
339+ private List < VCSDiffEntry > fillUnifiedDiffs (final String srcBranchName , final String dstBranchName , List <VCSDiffEntry > entries )
340340 throws SVNException {
341+ List <VCSDiffEntry > res = new ArrayList <>();
341342 for (VCSDiffEntry entry : entries ) {
342343 ByteArrayOutputStream baos = new ByteArrayOutputStream ();
343344
@@ -363,11 +364,12 @@ private void fillUnifiedDiffs(final String srcBranchName, final String dstBranch
363364 diff .run ();
364365
365366 try {
366- entry .setUnifiedDiff ( baos .toString ("UTF-8" ));
367+ res . add ( new VCSDiffEntry ( entry .getFilePath (), entry . getChangeType (), baos .toString ("UTF-8" ) ));
367368 } catch (UnsupportedEncodingException e ) {
368369 throw new RuntimeException (e );
369370 }
370371 }
372+ return res ;
371373 }
372374
373375 private SVNLogEntry getBranchFirstCommit (final String branchPath ) throws SVNException {
@@ -399,7 +401,7 @@ public void receive(SvnTarget target, SvnDiffStatus diffStatus) throws SVNExcept
399401 return ;
400402 }
401403 VCSDiffEntry entry = new VCSDiffEntry (diffStatus .getPath (),
402- SVNChangeTypeToVCSChangeType (diffStatus .getModificationType ()));
404+ SVNChangeTypeToVCSChangeType (diffStatus .getModificationType ()), null );
403405 res .add (entry );
404406 }
405407
@@ -426,7 +428,7 @@ public List<VCSDiffEntry> getBranchesDiff(final String srcBranchName, final Stri
426428 try (IVCSLockedWorkingCopy wc = repo .getVCSLockedWorkingCopy ()) {
427429 checkout (getBranchUrl (dstBranchName ), wc .getFolder ());
428430 List <VCSDiffEntry > entries = getDiffEntries (srcBranchName , dstBranchName );
429- fillUnifiedDiffs (srcBranchName , dstBranchName , entries );
431+ entries = fillUnifiedDiffs (srcBranchName , dstBranchName , entries );
430432 return entries ;
431433 }
432434 } catch (SVNException e ) {
0 commit comments