mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-06-28 11:32:22 +00:00
cb6edbf448
checkUpdates() ran `git rev-list HEAD..origin/<branch> --count` unconditionally in the parallel probe batch, even on the shallow + no-merge-base path where resolveBehindCount() ignores the result and falls back to a SHA compare. In the #51922 failure mode that count walks the entire remote ancestry (thousands of commits), so the work was pure latency on every update check for the exact case the fix targets. Split the probes into two phases: resolve --is-shallow-repository and merge-base first, then run rev-list --count only when shouldCountCommits says the number is meaningful (full clone, or shallow-with-merge-base). The shallow/no-merge-base SHA fallback is preserved unchanged.
79 lines
3.1 KiB
JavaScript
79 lines
3.1 KiB
JavaScript
'use strict'
|
|
const test = require('node:test')
|
|
const assert = require('node:assert/strict')
|
|
const { resolveBehindCount, shouldCountCommits } = require('./update-count.cjs')
|
|
|
|
// FAIL-BEFORE: pre-fix the function did `Number.parseInt(countStr) || 0`
|
|
// unconditionally, so a shallow checkout with no merge-base surfaced the bogus
|
|
// rev-list count (e.g. 12104). This asserts the new shallow/no-merge-base branch.
|
|
test('shallow checkout with no merge-base does NOT trust the bogus rev-list count', () => {
|
|
assert.equal(resolveBehindCount({
|
|
countStr: '12104', currentSha: 'aaa', targetSha: 'bbb',
|
|
isShallow: true, hasMergeBase: false,
|
|
}), 1)
|
|
})
|
|
|
|
test('shallow checkout with no merge-base but identical SHA reports up-to-date', () => {
|
|
assert.equal(resolveBehindCount({
|
|
countStr: '12104', currentSha: 'abc', targetSha: 'abc',
|
|
isShallow: true, hasMergeBase: false,
|
|
}), 0)
|
|
})
|
|
|
|
test('shallow checkout WITH a merge-base keeps the exact count (reliable)', () => {
|
|
assert.equal(resolveBehindCount({
|
|
countStr: '3', currentSha: 'aaa', targetSha: 'bbb',
|
|
isShallow: true, hasMergeBase: true,
|
|
}), 3)
|
|
})
|
|
|
|
test('full (non-shallow) clone keeps the exact count path unchanged', () => {
|
|
assert.equal(resolveBehindCount({
|
|
countStr: '7', currentSha: 'aaa', targetSha: 'bbb',
|
|
isShallow: false, hasMergeBase: true,
|
|
}), 7)
|
|
})
|
|
|
|
test('up-to-date full clone reports 0', () => {
|
|
assert.equal(resolveBehindCount({
|
|
countStr: '0', currentSha: 'x', targetSha: 'x',
|
|
isShallow: false, hasMergeBase: true,
|
|
}), 0)
|
|
})
|
|
|
|
test('non-numeric count falls back to 0 (defensive, unchanged behaviour)', () => {
|
|
assert.equal(resolveBehindCount({
|
|
countStr: '', currentSha: 'aaa', targetSha: 'bbb',
|
|
isShallow: false, hasMergeBase: true,
|
|
}), 0)
|
|
})
|
|
|
|
// shouldCountCommits gates the expensive `rev-list --count` in checkUpdates().
|
|
// FAIL-BEFORE: in the shallow + no-merge-base case the caller ran rev-list
|
|
// unconditionally and discarded the bogus result; this predicate lets the
|
|
// caller SKIP the whole-ancestry enumeration in exactly that case (#51922).
|
|
test('shallow checkout with no merge-base SKIPS the rev-list count', () => {
|
|
assert.equal(shouldCountCommits({ isShallow: true, hasMergeBase: false }), false)
|
|
})
|
|
|
|
test('shallow checkout WITH a merge-base still runs the count', () => {
|
|
assert.equal(shouldCountCommits({ isShallow: true, hasMergeBase: true }), true)
|
|
})
|
|
|
|
test('full (non-shallow) clone always runs the count', () => {
|
|
assert.equal(shouldCountCommits({ isShallow: false, hasMergeBase: true }), true)
|
|
assert.equal(shouldCountCommits({ isShallow: false, hasMergeBase: false }), true)
|
|
})
|
|
|
|
// The skip path produces an empty countStr; resolveBehindCount must NOT trust
|
|
// it and must fall through to the SHA compare (mirrors the live call site).
|
|
test('skipped-count path resolves via SHA compare, never via empty countStr', () => {
|
|
assert.equal(resolveBehindCount({
|
|
countStr: '', currentSha: 'aaa', targetSha: 'bbb',
|
|
isShallow: true, hasMergeBase: false,
|
|
}), 1)
|
|
assert.equal(resolveBehindCount({
|
|
countStr: '', currentSha: 'same', targetSha: 'same',
|
|
isShallow: true, hasMergeBase: false,
|
|
}), 0)
|
|
})
|