Tucker McKnight
Fix bug and type errors in the ahead/behind logic Also display the ahead/behidn count on the branches page.
19
<div class="card-body">${branch.description || ''}</div>
19
<div class="card-body">
<p>${branch.description || ''}</p>
<p>${branch.ahead} commits ahead, ${branch.behind} commits behind <span class="font-monospace">${branch.compareTo}</span></p>
</div>
13
if (branch.compareTo) { result['compareTo'] = branch.compareTo }
13
compareTo: branch.compareTo,
ahead: branch.ahead,
behind: branch.behind,
6
compareTo?: string,
6
ahead: number,
behind: number,
compareTo: string,
121 122
branches.forEach((branch) => {
const compareToBranch = branches.find((test) => test.name = compareTo)
121 122
const branchesWithCompareToInfo: Repository['branches'] = branches.map((branch) => {
const compareToBranch = branches.find((test) => test.name === compareTo)
142 143 144 145 146 147 148
const onlyInThisBranch = thisBranchCommits.difference(compareToBranchCommits).size
const onlyInCompareToBranch = compareToBranchCommits.difference(thisBranchCommits).size
branch['ahead'] = onlyInThisBranch
branch['behind'] = onlyInCompareToBranch
branch['compareTo'] = compareTo
branches,
142 143 144 145 146 147 148
const onlyInThisBranch = Array.from(thisBranchCommits).filter(thisBranchCommit => !compareToBranchCommits.has(thisBranchCommit)).length
const onlyInCompareToBranch = Array.from(compareToBranchCommits).filter(compareToBranchCommit => !thisBranchCommits.has(compareToBranchCommit)).length
const compareToInfo = {
ahead: onlyInThisBranch,
behind: onlyInCompareToBranch,
compareTo: compareTo,
}
return {...branch, ...compareToInfo}
branches: branchesWithCompareToInfo,