appview,knotserver: produce combined patch in comparisons #609

this is calculated by the knotserver in sh.tangled.repo.compare and cached by the appview in pull submissions, this cannot be calculated on the appview side with just the format-patch because this calculation requires a git-index.

Signed-off-by: oppiliappan me@oppi.li

+7 -7

7 changed files

Interdiff #1 → #2

expand all

unified split

appview

db.go

pulls.go

models

pull.go

pulls

pulls.go

repo

repo.go

knotserver

xrpc

repo_compare.go

types

repo.go

appview/db/db.go

This patch was likely rebased, as context lines do not match.

appview/db/pulls.go

This file has not been changed.

appview/models/pull.go

This file has not been changed.

appview/pulls/pulls.go

This patch was likely rebased, as context lines do not match.

+7 -7

appview/repo/repo.go

··· 2527 2527 return 2528 2528 } 2529 2529 2530 - var diff types.NiceDiff 2531 - if formatPatch.CombinedPatchRaw != "" { 2532 - diff = patchutil.AsNiceDiff(formatPatch.CombinedPatchRaw, base) 2533 - } else { 2534 - diff = patchutil.AsNiceDiff(formatPatch.FormatPatchRaw, base) 2535 - } 2530 + diff := patchutil.AsNiceDiff(formatPatch.Patch, base) 2536 2531 2537 2532 repoinfo := f.RepoInfo(user) 2538 2533 ··· 2570 2565 return 2571 2566 } 2572 2567 2573 - diff := patchutil.AsNiceDiff(formatPatch.Patch, base) 2568 + var diff types.NiceDiff 2569 + if formatPatch.CombinedPatchRaw != "" { 2570 + diff = patchutil.AsNiceDiff(formatPatch.CombinedPatchRaw, base) 2571 + } else { 2572 + diff = patchutil.AsNiceDiff(formatPatch.FormatPatchRaw, base) 2573 + } 2574 2574 2575 2575 repoinfo := f.RepoInfo(user) 2576 2576

knotserver/xrpc/repo_compare.go

This file has not been changed.

types/repo.go

This file has not been changed.