diff options
89 files changed, 1975 insertions, 39 deletions
diff --git a/config/config_test.go b/config/config_test.go index 8301d294..8364b264 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -34,11 +34,7 @@ func gitConfigGetE(testRepo *testgit.TestRepo, key string) (string, error) { //nolint:noctx cmd := exec.Command("git", "config", "--get", key) //#nosec G204 cmd.Dir = testRepo.Dir() - - cmd.Env = append(os.Environ(), - "GIT_CONFIG_GLOBAL=/dev/null", - "GIT_CONFIG_SYSTEM=/dev/null", - ) + cmd.Env = testRepo.Env() out, err := cmd.CombinedOutput() return strings.TrimSpace(string(out)), err diff --git a/format/commitgraph/TODO b/format/commitgraph/TODO new file mode 100644 index 00000000..87e0888d --- /dev/null +++ b/format/commitgraph/TODO @@ -0,0 +1,6 @@ +Paranoia mode +Split commit-graph chain with mixed generation and bloom setting +Separate chunk parsing layer +Config stuff + +Writing diff --git a/format/commitgraph/bloom.go b/format/commitgraph/bloom.go new file mode 100644 index 00000000..660dc1db --- /dev/null +++ b/format/commitgraph/bloom.go @@ -0,0 +1,114 @@ +package commitgraph + +import ( + "encoding/binary" + + "codeberg.org/lindenii/furgit/format/commitgraph/bloom" + "codeberg.org/lindenii/furgit/internal/intconv" +) + +// HasBloom reports whether any layer has changed-path Bloom data. +func (reader *Reader) HasBloom() bool { + for i := range reader.layers { + layer := &reader.layers[i] + if layer.chunkBloomIndex != nil && layer.chunkBloomData != nil && layer.bloomSettings != nil { + return true + } + } + + return false +} + +// BloomVersion returns the changed-path Bloom hash version, or 0 if absent. +func (reader *Reader) BloomVersion() uint8 { + for i := len(reader.layers) - 1; i >= 0; i-- { + layer := &reader.layers[i] + if layer.bloomSettings != nil { + version, err := intconv.Uint32ToUint8(layer.bloomSettings.HashVersion) + if err != nil { + return 0 + } + + return version + } + } + + return 0 +} + +// BloomFilterAt returns one commit's changed-path Bloom filter. +// +// Returns ErrBloomUnavailable when this commit graph has no Bloom data. +func (reader *Reader) BloomFilterAt(pos Position) (*bloom.Filter, error) { + layer, err := reader.layerByPosition(pos) + if err != nil { + return nil, err + } + + if layer.chunkBloomIndex == nil || layer.chunkBloomData == nil || layer.bloomSettings == nil { + return nil, &ErrBloomUnavailable{Pos: pos} + } + + start, end, err := bloomRange(layer, pos.Index) + if err != nil { + return nil, err + } + + filter := bloom.NewFilter( + layer.chunkBloomData[bloom.DataHeaderSize+start:bloom.DataHeaderSize+end], + *layer.bloomSettings, + ) + + return filter, nil +} + +func bloomRange(layer *layer, commitIndex uint32) (int, int, error) { + off64 := uint64(commitIndex) * 4 + + off, err := intconv.Uint64ToInt(off64) + if err != nil { + return 0, 0, err + } + + end := binary.BigEndian.Uint32(layer.chunkBloomIndex[off : off+4]) + + var start uint32 + + if commitIndex > 0 { + prevOff64 := uint64(commitIndex-1) * 4 + + prevOff, err := intconv.Uint64ToInt(prevOff64) + if err != nil { + return 0, 0, err + } + + start = binary.BigEndian.Uint32(layer.chunkBloomIndex[prevOff : prevOff+4]) + } + + if end < start { + return 0, 0, &ErrMalformed{Path: layer.path, Reason: "invalid BIDX range"} + } + + bdatLen := len(layer.chunkBloomData) - bloom.DataHeaderSize + + bdatLenU32, err := intconv.IntToUint32(bdatLen) + if err != nil { + return 0, 0, err + } + + if end > bdatLenU32 { + return 0, 0, &ErrMalformed{Path: layer.path, Reason: "BIDX range out of BDAT bounds"} + } + + startInt, err := intconv.Uint64ToInt(uint64(start)) + if err != nil { + return 0, 0, err + } + + endInt, err := intconv.Uint64ToInt(uint64(end)) + if err != nil { + return 0, 0, err + } + + return startInt, endInt, nil +} diff --git a/format/commitgraph/bloom/contain.go b/format/commitgraph/bloom/contain.go index 4789b321..331b7687 100644 --- a/format/commitgraph/bloom/contain.go +++ b/format/commitgraph/bloom/contain.go @@ -5,22 +5,18 @@ package bloom // Evaluated against the full path and each of its directory prefixes. A true // result indicates a possible match; false means the path definitely did not // change. -func (f *Filter) MightContain(path []byte, settings *Settings) (bool, error) { - if f == nil || settings == nil { - return false, nil - } - +func (f *Filter) MightContain(path []byte) (bool, error) { if len(f.Data) == 0 { return false, nil } - keys, err := keyvec(path, settings) + keys, err := keyvec(path, f) if err != nil { return false, err } for i := range keys { - if filterContainsKey(f, &keys[i], settings) { + if filterContainsKey(f, keys[i]) { return true, nil } } diff --git a/format/commitgraph/bloom/filter.go b/format/commitgraph/bloom/filter.go index f56e9ba3..7c4aa1b8 100644 --- a/format/commitgraph/bloom/filter.go +++ b/format/commitgraph/bloom/filter.go @@ -6,6 +6,23 @@ package bloom // parent. Paths are expected to be in Git's slash-separated form and // are queried using a path and its prefixes (e.g. "a/b/c", "a/b", "a"). type Filter struct { - Data []byte - Version uint32 + Data []byte + + HashVersion uint32 + NumHashes uint32 + BitsPerEntry uint32 + MaxChangePaths uint32 +} + +// NewFilter constructs one query-ready bloom filter from raw data/settings. +func NewFilter(data []byte, settings Settings) *Filter { + out := &Filter{ + Data: data, + HashVersion: settings.HashVersion, + NumHashes: settings.NumHashes, + BitsPerEntry: settings.BitsPerEntry, + MaxChangePaths: settings.MaxChangePaths, + } + + return out } diff --git a/format/commitgraph/bloom/key.go b/format/commitgraph/bloom/key.go index 6e49959d..a15df904 100644 --- a/format/commitgraph/bloom/key.go +++ b/format/commitgraph/bloom/key.go @@ -1,10 +1,12 @@ package bloom +import "codeberg.org/lindenii/furgit/internal/intconv" + type key struct { hashes []uint32 } -func keyvec(path []byte, settings *Settings) ([]key, error) { +func keyvec(path []byte, filter *Filter) ([]key, error) { if len(path) == 0 { return nil, nil } @@ -19,7 +21,7 @@ func keyvec(path []byte, settings *Settings) ([]key, error) { keys := make([]key, 0, count) - full, err := keyFill(path, settings) + full, err := keyFill(path, filter) if err != nil { return nil, err } @@ -28,7 +30,7 @@ func keyvec(path []byte, settings *Settings) ([]key, error) { for i := len(path) - 1; i >= 0; i-- { if path[i] == '/' { - k, err := keyFill(path[:i], settings) + k, err := keyFill(path[:i], filter) if err != nil { return nil, err } @@ -40,7 +42,7 @@ func keyvec(path []byte, settings *Settings) ([]key, error) { return keys, nil } -func keyFill(path []byte, settings *Settings) (key, error) { +func keyFill(path []byte, filter *Filter) (key, error) { const ( seed0 = 0x293ae76f seed1 = 0x7e646e2c @@ -52,7 +54,8 @@ func keyFill(path []byte, settings *Settings) (key, error) { err error ) - if settings.HashVersion == 2 { //nolint:nestif + switch filter.HashVersion { + case 2: h0, err = murmur3SeededV2(seed0, path) if err != nil { return key{}, err @@ -62,7 +65,7 @@ func keyFill(path []byte, settings *Settings) (key, error) { if err != nil { return key{}, err } - } else { + case 1: h0, err = murmur3SeededV1(seed0, path) if err != nil { return key{}, err @@ -72,21 +75,29 @@ func keyFill(path []byte, settings *Settings) (key, error) { if err != nil { return key{}, err } + default: + return key{}, ErrInvalid } - hashes := make([]uint32, settings.NumHashes) - for i := range settings.NumHashes { - hashes[i] = h0 + i*h1 + hashCount, err := intconv.Uint32ToInt(filter.NumHashes) + if err != nil { + return key{}, ErrInvalid } - return key{hashes: hashes}, nil -} + hashes := make([]uint32, hashCount) + for i := range hashCount { + iU32, err := intconv.IntToUint32(i) + if err != nil { + return key{}, ErrInvalid + } -func filterContainsKey(filter *Filter, key *key, settings *Settings) bool { - if filter == nil || key == nil || settings == nil { - return false + hashes[i] = h0 + iU32*h1 } + return key{hashes: hashes}, nil +} + +func filterContainsKey(filter *Filter, key key) bool { if len(filter.Data) == 0 { return false } diff --git a/format/commitgraph/bloom/settings.go b/format/commitgraph/bloom/settings.go index 5aa122a9..764653bd 100644 --- a/format/commitgraph/bloom/settings.go +++ b/format/commitgraph/bloom/settings.go @@ -1,6 +1,10 @@ package bloom -import "encoding/binary" +import ( + "encoding/binary" + + "codeberg.org/lindenii/furgit/internal/intconv" +) // Settings describe the changed-paths Bloom filter parameters stored in // commit-graph BDAT chunks. @@ -27,5 +31,20 @@ func ParseSettings(bdat []byte) (*Settings, error) { MaxChangePaths: DefaultMaxChange, } + switch settings.HashVersion { + case 1, 2: + default: + return nil, ErrInvalid + } + + if settings.NumHashes == 0 { + return nil, ErrInvalid + } + + _, err := intconv.Uint32ToInt(settings.NumHashes) + if err != nil { + return nil, ErrInvalid + } + return settings, nil } diff --git a/format/commitgraph/close.go b/format/commitgraph/close.go new file mode 100644 index 00000000..8b9e2e9f --- /dev/null +++ b/format/commitgraph/close.go @@ -0,0 +1,18 @@ +package commitgraph + +// Close releases all mapped commit-graph files. +func (reader *Reader) Close() error { + var closeErr error + + for i := len(reader.layers) - 1; i >= 0; i-- { + err := reader.layers[i].close() + if err != nil && closeErr == nil { + closeErr = err + } + } + + reader.layers = nil + reader.total = 0 + + return closeErr +} diff --git a/format/commitgraph/commitat.go b/format/commitgraph/commitat.go new file mode 100644 index 00000000..4d5853b1 --- /dev/null +++ b/format/commitgraph/commitat.go @@ -0,0 +1,85 @@ +package commitgraph + +import ( + "encoding/binary" + + "codeberg.org/lindenii/furgit/internal/intconv" + "codeberg.org/lindenii/furgit/objectid" +) + +// CommitAt returns decoded commit-graph metadata at one position. +func (reader *Reader) CommitAt(pos Position) (Commit, error) { + layer, err := reader.layerByPosition(pos) + if err != nil { + return Commit{}, err + } + + hashSize := reader.algo.Size() + stride := hashSize + 16 + + strideU64, err := intconv.IntToUint64(stride) + if err != nil { + return Commit{}, err + } + + start64 := uint64(pos.Index) * strideU64 + end64 := start64 + strideU64 + + start, err := intconv.Uint64ToInt(start64) + if err != nil { + return Commit{}, err + } + + end, err := intconv.Uint64ToInt(end64) + if err != nil { + return Commit{}, err + } + + record := layer.chunkCommit[start:end] + + treeOID, err := objectid.FromBytes(reader.algo, record[:hashSize]) + if err != nil { + return Commit{}, err + } + + oid, err := reader.OIDAt(pos) + if err != nil { + return Commit{}, err + } + + p1 := binary.BigEndian.Uint32(record[hashSize : hashSize+4]) + p2 := binary.BigEndian.Uint32(record[hashSize+4 : hashSize+8]) + genAndTimeHi := binary.BigEndian.Uint32(record[hashSize+8 : hashSize+12]) + timeLow := binary.BigEndian.Uint32(record[hashSize+12 : hashSize+16]) + + timeHigh := uint64(genAndTimeHi & 0x3) + commitTimeU64 := (timeHigh << 32) | uint64(timeLow) + + commitTime, err := intconv.Uint64ToInt64(commitTimeU64) + if err != nil { + return Commit{}, err + } + + generationV1 := genAndTimeHi >> 2 + + generationV2, err := reader.readGenerationV2(layer, pos.Index, commitTimeU64) + if err != nil { + return Commit{}, err + } + + parent1, parent2, extra, err := reader.decodeParents(layer, p1, p2) + if err != nil { + return Commit{}, err + } + + return Commit{ + OID: oid, + TreeOID: treeOID, + Parent1: parent1, + Parent2: parent2, + ExtraParents: extra, + CommitTimeUnix: commitTime, + GenerationV1: generationV1, + GenerationV2: generationV2, + }, nil +} diff --git a/format/commitgraph/commits.go b/format/commitgraph/commits.go new file mode 100644 index 00000000..0f5313e9 --- /dev/null +++ b/format/commitgraph/commits.go @@ -0,0 +1,20 @@ +package commitgraph + +import "codeberg.org/lindenii/furgit/objectid" + +// Commit stores decoded commit-graph record data. +type Commit struct { + OID objectid.ObjectID + TreeOID objectid.ObjectID + Parent1 ParentRef + Parent2 ParentRef + ExtraParents []Position + CommitTimeUnix int64 + GenerationV1 uint32 + GenerationV2 uint64 +} + +// NumCommits returns total commits across loaded layers. +func (reader *Reader) NumCommits() uint32 { + return reader.total +} diff --git a/format/commitgraph/constants.go b/format/commitgraph/constants.go new file mode 100644 index 00000000..96648fae --- /dev/null +++ b/format/commitgraph/constants.go @@ -0,0 +1,32 @@ +package commitgraph + +const ( + fileSignature = 0x43475048 // "CGPH" + fileVersion = 1 +) + +const ( + chunkOIDF = 0x4f494446 // "OIDF" + chunkOIDL = 0x4f49444c // "OIDL" + chunkCDAT = 0x43444154 // "CDAT" + chunkGDA2 = 0x47444132 // "GDA2" + chunkGDO2 = 0x47444f32 // "GDO2" + chunkEDGE = 0x45444745 // "EDGE" + chunkBIDX = 0x42494458 // "BIDX" + chunkBDAT = 0x42444154 // "BDAT" + chunkBASE = 0x42415345 // "BASE" +) + +const ( + headerSize = 8 + chunkEntrySize = 12 + fanoutSize = 256 * 4 +) + +const ( + parentNone = 0x70000000 + parentExtraMask = 0x80000000 + parentLastMask = 0x7fffffff + + generationOverflow = 0x80000000 +) diff --git a/format/commitgraph/edges.go b/format/commitgraph/edges.go new file mode 100644 index 00000000..277735d0 --- /dev/null +++ b/format/commitgraph/edges.go @@ -0,0 +1,47 @@ +package commitgraph + +import ( + "encoding/binary" + + "codeberg.org/lindenii/furgit/internal/intconv" +) + +func (reader *Reader) decodeExtraEdgeList(layer *layer, edgeStart uint32) ([]Position, error) { + if len(layer.chunkExtraEdges) == 0 { + return nil, &ErrMalformed{Path: layer.path, Reason: "missing EDGE chunk"} + } + + out := make([]Position, 0) + + cur := edgeStart + for { + off64 := uint64(cur) * 4 + + off, err := intconv.Uint64ToInt(off64) + if err != nil { + return nil, err + } + + if off+4 > len(layer.chunkExtraEdges) { + return nil, &ErrMalformed{Path: layer.path, Reason: "EDGE index out of range"} + } + + word := binary.BigEndian.Uint32(layer.chunkExtraEdges[off : off+4]) + parentGlobal := word & parentLastMask + + parentPos, err := reader.globalToPosition(parentGlobal) + if err != nil { + return nil, err + } + + out = append(out, parentPos) + + if word&parentExtraMask != 0 { + break + } + + cur++ + } + + return out, nil +} diff --git a/format/commitgraph/errors.go b/format/commitgraph/errors.go new file mode 100644 index 00000000..0b7b7b6f --- /dev/null +++ b/format/commitgraph/errors.go @@ -0,0 +1,58 @@ +package commitgraph + +import ( + "fmt" + + "codeberg.org/lindenii/furgit/objectid" +) + +// ErrNotFound reports a missing commit graph entry by object ID. +type ErrNotFound struct { + OID objectid.ObjectID +} + +// Error implements error. +func (err *ErrNotFound) Error() string { + return fmt.Sprintf("format/commitgraph: object not found: %s", err.OID) +} + +// ErrPositionOutOfRange reports an invalid graph position. +type ErrPositionOutOfRange struct { + Pos Position +} + +// Error implements error. +func (err *ErrPositionOutOfRange) Error() string { + return fmt.Sprintf("format/commitgraph: position out of range: graph=%d index=%d", err.Pos.Graph, err.Pos.Index) +} + +// ErrMalformed reports malformed commit-graph data. +type ErrMalformed struct { + Path string + Reason string +} + +// Error implements error. +func (err *ErrMalformed) Error() string { + return fmt.Sprintf("format/commitgraph: malformed %q: %s", err.Path, err.Reason) +} + +// ErrUnsupportedVersion reports unsupported commit-graph version. +type ErrUnsupportedVersion struct { + Version uint8 +} + +// Error implements error. +func (err *ErrUnsupportedVersion) Error() string { + return fmt.Sprintf("format/commitgraph: unsupported version %d", err.Version) +} + +// ErrBloomUnavailable reports missing changed-path bloom data at one position. +type ErrBloomUnavailable struct { + Pos Position +} + +// Error implements error. +func (err *ErrBloomUnavailable) Error() string { + return fmt.Sprintf("format/commitgraph: bloom unavailable at position graph=%d index=%d", err.Pos.Graph, err.Pos.Index) +} diff --git a/format/commitgraph/generation.go b/format/commitgraph/generation.go new file mode 100644 index 00000000..41c743ab --- /dev/null +++ b/format/commitgraph/generation.go @@ -0,0 +1,42 @@ +package commitgraph + +import ( + "encoding/binary" + + "codeberg.org/lindenii/furgit/internal/intconv" +) + +func (reader *Reader) readGenerationV2(layer *layer, index uint32, commitTime uint64) (uint64, error) { + if len(layer.chunkGeneration) == 0 { + return 0, nil + } + + off64 := uint64(index) * 4 + + off, err := intconv.Uint64ToInt(off64) + if err != nil { + return 0, err + } + + value := binary.BigEndian.Uint32(layer.chunkGeneration[off : off+4]) + + if value&generationOverflow == 0 { + return commitTime + uint64(value), nil + } + + gdo2Index := value ^ generationOverflow + gdo2Off64 := uint64(gdo2Index) * 8 + + gdo2Off, err := intconv.Uint64ToInt(gdo2Off64) + if err != nil { + return 0, err + } + + if gdo2Off+8 > len(layer.chunkGenerationOv) { + return 0, &ErrMalformed{Path: layer.path, Reason: "GDO2 index out of range"} + } + + overflow := binary.BigEndian.Uint64(layer.chunkGenerationOv[gdo2Off : gdo2Off+8]) + + return commitTime + overflow, nil +} diff --git a/format/commitgraph/hash.go b/format/commitgraph/hash.go new file mode 100644 index 00000000..55bc0195 --- /dev/null +++ b/format/commitgraph/hash.go @@ -0,0 +1,79 @@ +package commitgraph + +import ( + "bytes" + "fmt" + "io" + + "codeberg.org/lindenii/furgit/objectid" +) + +// HashVersion returns the commit-graph hash version. +func (reader *Reader) HashVersion() uint8 { + return reader.hashVersion +} + +func validateChainBaseHashes(algo objectid.Algorithm, chain []string, idx int, graph *layer) error { + if idx == 0 { + if len(graph.chunkBaseGraphs) != 0 { + return &ErrMalformed{Path: graph.path, Reason: "unexpected BASE chunk in first graph"} + } + + return nil + } + + hashSize := algo.Size() + + expectedLen := idx * hashSize + if len(graph.chunkBaseGraphs) != expectedLen { + return &ErrMalformed{ + Path: graph.path, + Reason: fmt.Sprintf("BASE chunk length %d does not match expected %d", len(graph.chunkBaseGraphs), expectedLen), + } + } + + for i := range idx { + start := i * hashSize + end := start + hashSize + + baseHash, err := objectid.FromBytes(algo, graph.chunkBaseGraphs[start:end]) + if err != nil { + return err + } + + if baseHash.String() != chain[i] { + return &ErrMalformed{ + Path: graph.path, + Reason: fmt.Sprintf("BASE chunk mismatch at index %d", i), + } + } + } + + return nil +} + +func verifyTrailerHash(data []byte, algo objectid.Algorithm, path string) error { + hashSize := algo.Size() + if len(data) < hashSize { + return &ErrMalformed{Path: path, Reason: "file too short for trailer"} + } + + hashImpl, err := algo.New() + if err != nil { + return err + } + + _, err = io.Copy(hashImpl, bytes.NewReader(data[:len(data)-hashSize])) + if err != nil { + return err + } + + got := hashImpl.Sum(nil) + + want := data[len(data)-hashSize:] + if !bytes.Equal(got, want) { + return &ErrMalformed{Path: path, Reason: "trailer hash mismatch"} + } + + return nil +} diff --git a/format/commitgraph/iterators.go b/format/commitgraph/iterators.go new file mode 100644 index 00000000..27385709 --- /dev/null +++ b/format/commitgraph/iterators.go @@ -0,0 +1,45 @@ +package commitgraph + +import ( + "iter" + + "codeberg.org/lindenii/furgit/internal/intconv" + "codeberg.org/lindenii/furgit/objectid" +) + +// AllPositions iterates all commit positions in native layer order. +func (reader *Reader) AllPositions() iter.Seq[Position] { + return func(yield func(Position) bool) { + for layerIdx := range reader.layers { + layer := &reader.layers[layerIdx] + + graph, err := intconv.IntToUint32(layerIdx) + if err != nil { + return + } + + for idx := range layer.numCommits { + if !yield(Position{Graph: graph, Index: idx}) { + return + } + } + } + } +} + +// AllOIDs iterates all commit object IDs in native layer order. +func (reader *Reader) AllOIDs() iter.Seq[objectid.ObjectID] { + return func(yield func(objectid.ObjectID) bool) { + positions := reader.AllPositions() + for pos := range positions { + oid, err := reader.OIDAt(pos) + if err != nil { + return + } + + if !yield(oid) { + return + } + } + } +} diff --git a/format/commitgraph/layers.go b/format/commitgraph/layers.go new file mode 100644 index 00000000..bdab6b79 --- /dev/null +++ b/format/commitgraph/layers.go @@ -0,0 +1,484 @@ +package commitgraph + +import ( + "bytes" + "encoding/binary" + "os" + "syscall" + + "codeberg.org/lindenii/furgit/format/commitgraph/bloom" + "codeberg.org/lindenii/furgit/internal/intconv" + "codeberg.org/lindenii/furgit/objectid" +) + +// LayerInfo describes one loaded commit-graph layer. +type LayerInfo struct { + Path string + BaseCount uint32 + Commits uint32 +} + +type layer struct { + path string + file *os.File + data []byte + numCommits uint32 + baseCount uint32 + globalFrom uint32 + + chunkOIDFanout []byte + chunkOIDLookup []byte + chunkCommit []byte + chunkGeneration []byte + chunkGenerationOv []byte + chunkExtraEdges []byte + chunkBloomIndex []byte + chunkBloomData []byte + chunkBaseGraphs []byte + + bloomSettings *bloom.Settings +} + +// Layers returns loaded layer metadata in native chain order. +func (reader *Reader) Layers() []LayerInfo { + out := make([]LayerInfo, 0, len(reader.layers)) + for i := range reader.layers { + layer := reader.layers[i] + out = append(out, LayerInfo{ + Path: layer.path, + BaseCount: layer.baseCount, + Commits: layer.numCommits, + }) + } + + return out +} + +func (reader *Reader) layerByPosition(pos Position) (*layer, error) { + graphIdx, err := intconv.Uint64ToInt(uint64(pos.Graph)) + if err != nil { + return nil, err + } + + if graphIdx < 0 || graphIdx >= len(reader.layers) { + return nil, &ErrPositionOutOfRange{Pos: pos} + } + + layer := &reader.layers[graphIdx] + if pos.Index >= layer.numCommits { + return nil, &ErrPositionOutOfRange{Pos: pos} + } + + return layer, nil +} + +func layerLookup(layer *layer, oid objectid.ObjectID) (uint32, bool) { + hashSize := oid.Size() + first := int(oid.RawBytes()[0]) + + var lo uint32 + if first > 0 { + lo = binary.BigEndian.Uint32(layer.chunkOIDFanout[(first-1)*4 : first*4]) + } + + hi := binary.BigEndian.Uint32(layer.chunkOIDFanout[first*4 : (first+1)*4]) + if hi == 0 || lo >= hi { + return 0, false + } + + target := oid.RawBytes() + left := int(lo) + + right := int(hi) - 1 + for left <= right { + mid := left + (right-left)/2 + start := mid * hashSize + end := start + hashSize + + current := layer.chunkOIDLookup[start:end] + + cmp := bytes.Compare(current, target) + switch { + case cmp == 0: + pos, err := intconv.IntToUint32(mid) + if err != nil { + return 0, false + } + + return pos, true + case cmp < 0: + left = mid + 1 + default: + right = mid - 1 + } + } + + return 0, false +} + +func openLayer(root *os.Root, relPath string, algo objectid.Algorithm) (*layer, error) { + file, err := root.Open(relPath) + if err != nil { + return nil, err + } + + info, err := file.Stat() + if err != nil { + _ = file.Close() + + return nil, err + } + + size := info.Size() + if size < int64(headerSize+fanoutSize+algo.Size()) { + _ = file.Close() + + return nil, &ErrMalformed{Path: relPath, Reason: "file too short"} + } + + mapLen, err := intconv.Int64ToUint64(size) + if err != nil { + _ = file.Close() + + return nil, err + } + + mapLenInt, err := intconv.Uint64ToInt(mapLen) + if err != nil { + _ = file.Close() + + return nil, err + } + + fd, err := intconv.UintptrToInt(file.Fd()) + if err != nil { + _ = file.Close() + + return nil, err + } + + data, err := syscall.Mmap(fd, 0, mapLenInt, syscall.PROT_READ, syscall.MAP_PRIVATE) + if err != nil { + _ = file.Close() + + return nil, err + } + + out := &layer{ + path: relPath, + file: file, + data: data, + } + + parseErr := parseLayer(out, algo) + if parseErr != nil { + _ = out.close() + + return nil, parseErr + } + + verifyErr := verifyTrailerHash(out.data, algo, relPath) + if verifyErr != nil { + _ = out.close() + + return nil, verifyErr + } + + return out, nil +} + +func parseLayer(layer *layer, algo objectid.Algorithm) error { //nolint:maintidx + if len(layer.data) < headerSize { + return &ErrMalformed{Path: layer.path, Reason: "file too short"} + } + + header := layer.data[:headerSize] + + signature := binary.BigEndian.Uint32(header[:4]) + if signature != fileSignature { + return &ErrMalformed{Path: layer.path, Reason: "invalid signature"} + } + + version := header[4] + if version != fileVersion { + return &ErrUnsupportedVersion{Version: version} + } + + expectedHashVersion, err := intconv.Uint32ToUint8(algo.PackHashID()) + if err != nil { + return err + } + + hashVersion := header[5] + if hashVersion != expectedHashVersion { + return &ErrMalformed{Path: layer.path, Reason: "hash version does not match object format"} + } + + numChunks := int(header[6]) + baseCount := uint32(header[7]) + + tocLen := (numChunks + 1) * chunkEntrySize + tocStart := headerSize + + tocEnd := tocStart + tocLen + if tocEnd > len(layer.data) { + return &ErrMalformed{Path: layer.path, Reason: "truncated chunk table"} + } + + type tocEntry struct { + id uint32 + offset uint64 + } + + entries := make([]tocEntry, 0, numChunks+1) + for i := range numChunks + 1 { + entryOff := tocStart + i*chunkEntrySize + entryData := layer.data[entryOff : entryOff+chunkEntrySize] + + entry := tocEntry{ + id: binary.BigEndian.Uint32(entryData[:4]), + offset: binary.BigEndian.Uint64(entryData[4:]), + } + entries = append(entries, entry) + } + + if entries[len(entries)-1].id != 0 { + return &ErrMalformed{Path: layer.path, Reason: "missing chunk table terminator"} + } + + trailerStart := len(layer.data) - algo.Size() + + chunks := make(map[uint32][]byte, numChunks) + for i := range numChunks { + entry := entries[i] + if entry.id == 0 { + return &ErrMalformed{Path: layer.path, Reason: "early chunk table terminator"} + } + + next := entries[i+1] + + start, err := intconv.Uint64ToInt(entry.offset) + if err != nil { + return err + } + + end, err := intconv.Uint64ToInt(next.offset) + if err != nil { + return err + } + + if start < tocEnd || end < start || end > trailerStart { + return &ErrMalformed{Path: layer.path, Reason: "invalid chunk offsets"} + } + + if _, exists := chunks[entry.id]; exists { + return &ErrMalformed{Path: layer.path, Reason: "duplicate chunk id"} + } + + chunks[entry.id] = layer.data[start:end] + } + + oidf := chunks[chunkOIDF] + if len(oidf) != fanoutSize { + return &ErrMalformed{Path: layer.path, Reason: "invalid OIDF length"} + } + + layer.chunkOIDFanout = oidf + layer.numCommits = binary.BigEndian.Uint32(oidf[fanoutSize-4:]) + + for i := range 255 { + cur := binary.BigEndian.Uint32(oidf[i*4 : (i+1)*4]) + + next := binary.BigEndian.Uint32(oidf[(i+1)*4 : (i+2)*4]) + if cur > next { + return &ErrMalformed{Path: layer.path, Reason: "non-monotonic OIDF fanout"} + } + } + + hashSize := algo.Size() + + hashSizeU64, err := intconv.IntToUint64(hashSize) + if err != nil { + return err + } + + oidl := chunks[chunkOIDL] + oidlWantLen64 := uint64(layer.numCommits) * hashSizeU64 + + oidlWantLen, err := intconv.Uint64ToInt(oidlWantLen64) + if err != nil { + return err + } + + if len(oidl) != oidlWantLen { + return &ErrMalformed{Path: layer.path, Reason: "invalid OIDL length"} + } + + layer.chunkOIDLookup = oidl + + stride := hashSize + 16 + + strideU64, err := intconv.IntToUint64(stride) + if err != nil { + return err + } + + cdat := chunks[chunkCDAT] + cdatWantLen64 := uint64(layer.numCommits) * strideU64 + + cdatWantLen, err := intconv.Uint64ToInt(cdatWantLen64) + if err != nil { + return err + } + + if len(cdat) != cdatWantLen { + return &ErrMalformed{Path: layer.path, Reason: "invalid CDAT length"} + } + + layer.chunkCommit = cdat + + gda2 := chunks[chunkGDA2] + if len(gda2) != 0 { + wantLen64 := uint64(layer.numCommits) * 4 + + wantLen, err := intconv.Uint64ToInt(wantLen64) + if err != nil { + return err + } + + if len(gda2) != wantLen { + return &ErrMalformed{Path: layer.path, Reason: "invalid GDA2 length"} + } + + layer.chunkGeneration = gda2 + } + + gdo2 := chunks[chunkGDO2] + if len(gdo2) != 0 { + if len(gdo2)%8 != 0 { + return &ErrMalformed{Path: layer.path, Reason: "invalid GDO2 length"} + } + + layer.chunkGenerationOv = gdo2 + } + + edge := chunks[chunkEDGE] + if len(edge) != 0 { + if len(edge)%4 != 0 { + return &ErrMalformed{Path: layer.path, Reason: "invalid EDGE length"} + } + + layer.chunkExtraEdges = edge + } + + base := chunks[chunkBASE] + if baseCount == 0 { + if len(base) != 0 { + return &ErrMalformed{Path: layer.path, Reason: "unexpected BASE chunk"} + } + } else { + wantLen64 := uint64(baseCount) * hashSizeU64 + + wantLen, err := intconv.Uint64ToInt(wantLen64) + if err != nil { + return err + } + + if len(base) != wantLen { + return &ErrMalformed{Path: layer.path, Reason: "invalid BASE length"} + } + + layer.chunkBaseGraphs = base + } + + layer.baseCount = baseCount + + bidx := chunks[chunkBIDX] + + bdat := chunks[chunkBDAT] + if len(bidx) != 0 || len(bdat) != 0 { //nolint:nestif + if len(bidx) == 0 || len(bdat) == 0 { + return &ErrMalformed{Path: layer.path, Reason: "BIDX/BDAT must both be present"} + } + + bidxWantLen64 := uint64(layer.numCommits) * 4 + + bidxWantLen, err := intconv.Uint64ToInt(bidxWantLen64) + if err != nil { + return err + } + + if len(bidx) != bidxWantLen { + return &ErrMalformed{Path: layer.path, Reason: "invalid BIDX length"} + } + + if len(bdat) < bloom.DataHeaderSize { + return &ErrMalformed{Path: layer.path, Reason: "invalid BDAT length"} + } + + settings, err := bloom.ParseSettings(bdat) + if err != nil { + return err + } + + prev := uint32(0) + + for i := range layer.numCommits { + off := int(i) * 4 + + cur := binary.BigEndian.Uint32(bidx[off : off+4]) + if i > 0 && cur < prev { + return &ErrMalformed{Path: layer.path, Reason: "non-monotonic BIDX"} + } + + bdatDataLen := len(bdat) - bloom.DataHeaderSize + + bdatDataLenU32, err := intconv.IntToUint32(bdatDataLen) + if err != nil { + return err + } + + if cur > bdatDataLenU32 { + return &ErrMalformed{Path: layer.path, Reason: "BIDX offset out of range"} + } + + prev = cur + } + + layer.chunkBloomIndex = bidx + layer.chunkBloomData = bdat + layer.bloomSettings = settings + } + + return nil +} + +func closeLayers(layers []layer) { + for i := len(layers) - 1; i >= 0; i-- { + _ = layers[i].close() + } +} + +func (layer *layer) close() error { + var closeErr error + + if layer.data != nil { + err := syscall.Munmap(layer.data) + if err != nil { + closeErr = err + } + + layer.data = nil + } + + if layer.file != nil { + err := layer.file.Close() + if err != nil && closeErr == nil { + closeErr = err + } + + layer.file = nil + } + + return closeErr +} diff --git a/format/commitgraph/lookup.go b/format/commitgraph/lookup.go new file mode 100644 index 00000000..2cd8bf75 --- /dev/null +++ b/format/commitgraph/lookup.go @@ -0,0 +1,29 @@ +package commitgraph + +import ( + "codeberg.org/lindenii/furgit/internal/intconv" + "codeberg.org/lindenii/furgit/objectid" +) + +// Lookup resolves one object ID to one graph position. +func (reader *Reader) Lookup(oid objectid.ObjectID) (Position, error) { + if oid.Algorithm() != reader.algo { + return Position{}, &ErrNotFound{OID: oid} + } + + for layerIdx := len(reader.layers) - 1; layerIdx >= 0; layerIdx-- { + layer := &reader.layers[layerIdx] + + found, ok := layerLookup(layer, oid) + if ok { + idxU32, err := intconv.IntToUint32(layerIdx) + if err != nil { + return Position{}, err + } + + return Position{Graph: idxU32, Index: found}, nil + } + } + + return Position{}, &ErrNotFound{OID: oid} +} diff --git a/format/commitgraph/mode.go b/format/commitgraph/mode.go new file mode 100644 index 00000000..71b55412 --- /dev/null +++ b/format/commitgraph/mode.go @@ -0,0 +1,11 @@ +package commitgraph + +// OpenMode controls which commit-graph layout Open loads. +type OpenMode uint8 + +const ( + // OpenSingle opens one commit-graph file at info/commit-graph. + OpenSingle OpenMode = iota + // OpenChain opens chained commit-graphs from info/commit-graphs. + OpenChain +) diff --git a/format/commitgraph/oidat.go b/format/commitgraph/oidat.go new file mode 100644 index 00000000..e277125b --- /dev/null +++ b/format/commitgraph/oidat.go @@ -0,0 +1,36 @@ +package commitgraph + +import ( + "codeberg.org/lindenii/furgit/internal/intconv" + "codeberg.org/lindenii/furgit/objectid" +) + +// OIDAt returns object ID at one position. +func (reader *Reader) OIDAt(pos Position) (objectid.ObjectID, error) { + layer, err := reader.layerByPosition(pos) + if err != nil { + return objectid.ObjectID{}, err + } + + hashSize := reader.algo.Size() + + hashSizeU64, err := intconv.IntToUint64(hashSize) + if err != nil { + return objectid.ObjectID{}, err + } + + start64 := uint64(pos.Index) * hashSizeU64 + end64 := start64 + hashSizeU64 + + start, err := intconv.Uint64ToInt(start64) + if err != nil { + return objectid.ObjectID{}, err + } + + end, err := intconv.Uint64ToInt(end64) + if err != nil { + return objectid.ObjectID{}, err + } + + return objectid.FromBytes(reader.algo, layer.chunkOIDLookup[start:end]) +} diff --git a/format/commitgraph/open.go b/format/commitgraph/open.go new file mode 100644 index 00000000..7d4cbd5d --- /dev/null +++ b/format/commitgraph/open.go @@ -0,0 +1,173 @@ +package commitgraph + +import ( + "bufio" + "errors" + "fmt" + "os" + "strings" + + "codeberg.org/lindenii/furgit/internal/intconv" + "codeberg.org/lindenii/furgit/objectid" +) + +// Open opens commit-graph data from one objects root. +func Open(root *os.Root, algo objectid.Algorithm, mode OpenMode) (*Reader, error) { + if algo.Size() == 0 { + return nil, objectid.ErrInvalidAlgorithm + } + + switch mode { + case OpenSingle: + return openSingle(root, algo) + case OpenChain: + return openChain(root, algo) + default: + return nil, fmt.Errorf("format/commitgraph: invalid open mode %d", mode) + } +} + +func openSingle(root *os.Root, algo objectid.Algorithm) (*Reader, error) { + graph, err := openLayer(root, "info/commit-graph", algo) + if err != nil { + return nil, err + } + + graph.baseCount = 0 + graph.globalFrom = 0 + + hashVersion, err := intconv.Uint32ToUint8(algo.PackHashID()) + if err != nil { + return nil, err + } + + out := &Reader{ + algo: algo, + hashVersion: hashVersion, + layers: []layer{*graph}, + total: graph.numCommits, + } + + return out, nil +} + +func openChain(root *os.Root, algo objectid.Algorithm) (*Reader, error) { + chainPath := "info/commit-graphs/commit-graph-chain" + + file, err := root.Open(chainPath) + if err != nil { + if errors.Is(err, os.ErrNotExist) { + return nil, &ErrMalformed{Path: chainPath, Reason: "missing commit-graph-chain"} + } + + return nil, err + } + + scanner := bufio.NewScanner(file) + hashes := make([]string, 0) + + for scanner.Scan() { + line := strings.TrimSpace(scanner.Text()) + if line == "" { + continue + } + + hashes = append(hashes, line) + } + + scanErr := scanner.Err() + closeErr := file.Close() + + if scanErr != nil { + return nil, scanErr + } + + if closeErr != nil { + return nil, closeErr + } + + if len(hashes) == 0 { + return nil, &ErrMalformed{Path: chainPath, Reason: "empty chain"} + } + + layers := make([]layer, 0, len(hashes)) + + var total uint32 + + hashVersion, err := intconv.Uint32ToUint8(algo.PackHashID()) + if err != nil { + return nil, err + } + + for i, hashHex := range hashes { + expectedBaseCount, err := intconv.IntToUint32(i) + if err != nil { + closeLayers(layers) + + return nil, err + } + + if len(hashHex) != algo.HexLen() { + closeLayers(layers) + + return nil, &ErrMalformed{ + Path: chainPath, + Reason: fmt.Sprintf("invalid graph hash length at line %d", i+1), + } + } + + relPath := fmt.Sprintf("info/commit-graphs/graph-%s.graph", hashHex) + + loaded, loadErr := openLayer(root, relPath, algo) + if loadErr != nil { + closeLayers(layers) + + return nil, loadErr + } + + if loaded.baseCount != expectedBaseCount { + _ = loaded.close() + + closeLayers(layers) + + return nil, &ErrMalformed{ + Path: relPath, + Reason: fmt.Sprintf("BASE count %d does not match chain depth %d", loaded.baseCount, i), + } + } + + validateErr := validateChainBaseHashes(algo, hashes, i, loaded) + if validateErr != nil { + _ = loaded.close() + + closeLayers(layers) + + return nil, validateErr + } + + loaded.globalFrom = total + loaded.baseCount = expectedBaseCount + + totalNext := total + loaded.numCommits + if totalNext < total { + _ = loaded.close() + + closeLayers(layers) + + return nil, &ErrMalformed{Path: relPath, Reason: "total commit count overflow"} + } + + total = totalNext + + layers = append(layers, *loaded) + } + + out := &Reader{ + algo: algo, + hashVersion: hashVersion, + layers: layers, + total: total, + } + + return out, nil +} diff --git a/format/commitgraph/parents.go b/format/commitgraph/parents.go new file mode 100644 index 00000000..df6d33ff --- /dev/null +++ b/format/commitgraph/parents.go @@ -0,0 +1,65 @@ +package commitgraph + +// ParentRef references one parent position. +type ParentRef struct { + Valid bool + Pos Position +} + +func (reader *Reader) decodeParents(layer *layer, p1, p2 uint32) (ParentRef, ParentRef, []Position, error) { + parent1, err := reader.decodeSingleParent(p1) + if err != nil { + return ParentRef{}, ParentRef{}, nil, err + } + + if p2 == parentNone { + return parent1, ParentRef{}, nil, nil + } + + if p2&parentExtraMask == 0 { + parent2, err := reader.decodeSingleParent(p2) + if err != nil { + return ParentRef{}, ParentRef{}, nil, err + } + + return parent1, parent2, nil, nil + } + + edgeStart := p2 & parentLastMask + + parents, err := reader.decodeExtraEdgeList(layer, edgeStart) + if err != nil { + return ParentRef{}, ParentRef{}, nil, err + } + + if len(parents) == 0 { + return ParentRef{}, ParentRef{}, nil, &ErrMalformed{Path: layer.path, Reason: "empty EDGE list"} + } + + parent2 := ParentRef{Valid: true, Pos: parents[0]} + if len(parents) == 1 { + return parent1, parent2, nil, nil + } + + return parent1, parent2, parents[1:], nil +} + +func (reader *Reader) decodeSingleParent(raw uint32) (ParentRef, error) { + if raw == parentNone { + return ParentRef{}, nil + } + + if raw&parentExtraMask != 0 { + return ParentRef{}, &ErrMalformed{ + Path: "commit-graph", + Reason: "unexpected EDGE marker in single-parent slot", + } + } + + pos, err := reader.globalToPosition(raw) + if err != nil { + return ParentRef{}, err + } + + return ParentRef{Valid: true, Pos: pos}, nil +} diff --git a/format/commitgraph/position.go b/format/commitgraph/position.go new file mode 100644 index 00000000..5e8bd486 --- /dev/null +++ b/format/commitgraph/position.go @@ -0,0 +1,38 @@ +package commitgraph + +import ( + "fmt" + + "codeberg.org/lindenii/furgit/internal/intconv" +) + +// Position identifies one commit record by layer and row index. +type Position struct { + Graph uint32 + Index uint32 +} + +func (reader *Reader) globalToPosition(global uint32) (Position, error) { + for i := range reader.layers { + layer := &reader.layers[i] + from := layer.globalFrom + + to := from + layer.numCommits + if global >= from && global < to { + graph, err := intconv.IntToUint32(i) + if err != nil { + return Position{}, err + } + + return Position{ + Graph: graph, + Index: global - from, + }, nil + } + } + + return Position{}, &ErrMalformed{ + Path: "commit-graph", + Reason: fmt.Sprintf("parent global position out of range: %d", global), + } +} diff --git a/format/commitgraph/read_test.go b/format/commitgraph/read_test.go new file mode 100644 index 00000000..0771514a --- /dev/null +++ b/format/commitgraph/read_test.go @@ -0,0 +1,340 @@ +package commitgraph_test + +import ( + "errors" + "os" + "path/filepath" + "strconv" + "strings" + "testing" + + "codeberg.org/lindenii/furgit/format/commitgraph" + "codeberg.org/lindenii/furgit/format/commitgraph/bloom" + "codeberg.org/lindenii/furgit/internal/intconv" + "codeberg.org/lindenii/furgit/internal/testgit" + "codeberg.org/lindenii/furgit/objectid" +) + +func fixtureRepoPath(t *testing.T, algo objectid.Algorithm, name string) string { + t.Helper() + + return filepath.Join("testdata", "fixtures", algo.String(), name, "repo.git") +} + +func fixtureRepo(t *testing.T, algo objectid.Algorithm, name string) *testgit.TestRepo { + t.Helper() + + return testgit.NewRepoFromFixture(t, algo, fixtureRepoPath(t, algo, name)) +} + +func TestReadSingleMatchesGit(t *testing.T) { + t.Parallel() + + testgit.ForEachAlgorithm(t, func(t *testing.T, algo objectid.Algorithm) { //nolint:thelper + testRepo := fixtureRepo(t, algo, "single_changed") + + reader := openReader(t, testRepo, commitgraph.OpenSingle) + + defer func() { _ = reader.Close() }() + + allIDs := testRepo.RevList(t, "--all") + if len(allIDs) == 0 { + t.Fatal("git rev-list --all returned no commits") + } + + wantCommitCount, err := intconv.IntToUint32(len(allIDs)) + if err != nil { + t.Fatalf("len(allIDs) convert: %v", err) + } + + if got := reader.NumCommits(); got != wantCommitCount { + t.Fatalf("NumCommits() = %d, want %d", got, len(allIDs)) + } + + if !reader.HasBloom() { + t.Fatal("HasBloom() = false, want true") + } + + bloomVersion := reader.BloomVersion() + if bloomVersion == 0 { + t.Fatal("BloomVersion() = 0, want non-zero when HasBloom() is true") + } + + for _, id := range allIDs { + pos, err := reader.Lookup(id) + if err != nil { + t.Fatalf("Lookup(%s): %v", id, err) + } + + gotID, err := reader.OIDAt(pos) + if err != nil { + t.Fatalf("OIDAt(%+v): %v", pos, err) + } + + if gotID != id { + t.Fatalf("OIDAt(Lookup(%s)) = %s, want %s", id, gotID, id) + } + } + + step := len(allIDs) / 24 + if step < 1 { + step = 1 + } + + for i, id := range allIDs { + if i%step != 0 && i != len(allIDs)-1 { + continue + } + + verifyCommitAgainstGit(t, testRepo, reader, id) + } + }) +} + +func TestReadChainMatchesGit(t *testing.T) { + t.Parallel() + + testgit.ForEachAlgorithm(t, func(t *testing.T, algo objectid.Algorithm) { //nolint:thelper + testRepo := fixtureRepo(t, algo, "chain_changed") + + reader := openReader(t, testRepo, commitgraph.OpenChain) + + defer func() { _ = reader.Close() }() + + layers := reader.Layers() + if len(layers) < 2 { + t.Fatalf("Layers len = %d, want >= 2", len(layers)) + } + + allIDs := testRepo.RevList(t, "--all") + + wantCommitCount, err := intconv.IntToUint32(len(allIDs)) + if err != nil { + t.Fatalf("len(allIDs) convert: %v", err) + } + + if got := reader.NumCommits(); got != wantCommitCount { + t.Fatalf("NumCommits() = %d, want %d", got, len(allIDs)) + } + + step := len(allIDs) / 20 + if step < 1 { + step = 1 + } + + for i, id := range allIDs { + pos, err := reader.Lookup(id) + if err != nil { + t.Fatalf("Lookup(%s): %v", id, err) + } + + if i%step != 0 && i != len(allIDs)-1 { + continue + } + + gotID, err := reader.OIDAt(pos) + if err != nil { + t.Fatalf("OIDAt(%+v): %v", pos, err) + } + + if gotID != id { + t.Fatalf("OIDAt(Lookup(%s)) = %s, want %s", id, gotID, id) + } + } + }) +} + +func TestBloomUnavailableWithoutChangedPaths(t *testing.T) { + t.Parallel() + + testgit.ForEachAlgorithm(t, func(t *testing.T, algo objectid.Algorithm) { //nolint:thelper + testRepo := fixtureRepo(t, algo, "single_nochanged") + + reader := openReader(t, testRepo, commitgraph.OpenSingle) + + defer func() { _ = reader.Close() }() + + head := testRepo.RevParse(t, "HEAD") + + pos, err := reader.Lookup(head) + if err != nil { + t.Fatalf("Lookup(%s): %v", head, err) + } + + _, err = reader.BloomFilterAt(pos) + if err == nil { + t.Fatal("BloomFilterAt() error = nil, want ErrBloomUnavailable") + } + + var unavailable *commitgraph.ErrBloomUnavailable + if !errors.As(err, &unavailable) { + t.Fatalf("BloomFilterAt() error type = %T, want *ErrBloomUnavailable", err) + } + + if unavailable.Pos != pos { + t.Fatalf("ErrBloomUnavailable.Pos = %+v, want %+v", unavailable.Pos, pos) + } + }) +} + +func openReader(tb testing.TB, testRepo *testgit.TestRepo, mode commitgraph.OpenMode) *commitgraph.Reader { + tb.Helper() + + objectsPath := filepath.Join(testRepo.Dir(), "objects") + + root, err := os.OpenRoot(objectsPath) + if err != nil { + tb.Fatalf("os.OpenRoot(%q): %v", objectsPath, err) + } + + reader, err := commitgraph.Open(root, testRepo.Algorithm(), mode) + + closeErr := root.Close() + if closeErr != nil { + tb.Fatalf("close objects root: %v", closeErr) + } + + if err != nil { + tb.Fatalf("commitgraph.Open(%q): %v", objectsPath, err) + } + + return reader +} + +func verifyCommitAgainstGit(tb testing.TB, testRepo *testgit.TestRepo, reader *commitgraph.Reader, id objectid.ObjectID) { + tb.Helper() + + pos, err := reader.Lookup(id) + if err != nil { + tb.Fatalf("Lookup(%s): %v", id, err) + } + + commit, err := reader.CommitAt(pos) + if err != nil { + tb.Fatalf("CommitAt(%+v): %v", pos, err) + } + + if commit.OID != id { + tb.Fatalf("CommitAt(%+v).OID = %s, want %s", pos, commit.OID, id) + } + + treeHex := testRepo.Run(tb, "show", "-s", "--format=%T", id.String()) + + wantTree, err := objectid.ParseHex(testRepo.Algorithm(), treeHex) + if err != nil { + tb.Fatalf("parse tree id %q: %v", treeHex, err) + } + + if commit.TreeOID != wantTree { + tb.Fatalf("CommitAt(%+v).TreeOID = %s, want %s", pos, commit.TreeOID, wantTree) + } + + wantParents := parseOIDLine(tb, testRepo.Algorithm(), testRepo.Run(tb, "show", "-s", "--format=%P", id.String())) + + gotParents := commitParents(tb, reader, commit) + if len(gotParents) != len(wantParents) { + tb.Fatalf("parent count for %s = %d, want %d", id, len(gotParents), len(wantParents)) + } + + for i := range gotParents { + if gotParents[i] != wantParents[i] { + tb.Fatalf("parent %d for %s = %s, want %s", i, id, gotParents[i], wantParents[i]) + } + } + + commitTimeRaw := testRepo.Run(tb, "show", "-s", "--format=%ct", id.String()) + + wantCommitTime, err := strconv.ParseInt(strings.TrimSpace(commitTimeRaw), 10, 64) + if err != nil { + tb.Fatalf("parse commit time %q: %v", commitTimeRaw, err) + } + + if commit.CommitTimeUnix != wantCommitTime { + tb.Fatalf("CommitAt(%+v).CommitTimeUnix = %d, want %d", pos, commit.CommitTimeUnix, wantCommitTime) + } + + filter, err := reader.BloomFilterAt(pos) + if err != nil { + tb.Fatalf("BloomFilterAt(%+v): %v", pos, err) + } + + if filter.HashVersion != uint32(reader.BloomVersion()) { + tb.Fatalf("filter.HashVersion = %d, want %d", filter.HashVersion, reader.BloomVersion()) + } + + assertChangedPathsBloomPositive(tb, testRepo, filter, id) +} + +func commitParents(tb testing.TB, reader *commitgraph.Reader, commit commitgraph.Commit) []objectid.ObjectID { + tb.Helper() + + out := make([]objectid.ObjectID, 0, 2+len(commit.ExtraParents)) + + if commit.Parent1.Valid { + id, err := reader.OIDAt(commit.Parent1.Pos) + if err != nil { + tb.Fatalf("OIDAt(parent1 %+v): %v", commit.Parent1.Pos, err) + } + + out = append(out, id) + } + + if commit.Parent2.Valid { + id, err := reader.OIDAt(commit.Parent2.Pos) + if err != nil { + tb.Fatalf("OIDAt(parent2 %+v): %v", commit.Parent2.Pos, err) + } + + out = append(out, id) + } + + for _, parentPos := range commit.ExtraParents { + id, err := reader.OIDAt(parentPos) + if err != nil { + tb.Fatalf("OIDAt(extra parent %+v): %v", parentPos, err) + } + + out = append(out, id) + } + + return out +} + +func assertChangedPathsBloomPositive(tb testing.TB, testRepo *testgit.TestRepo, filter *bloom.Filter, commitID objectid.ObjectID) { + tb.Helper() + + changedPaths := testRepo.Run(tb, "diff-tree", "--no-commit-id", "--name-only", "-r", "--root", commitID.String()) + for line := range strings.SplitSeq(strings.TrimSpace(changedPaths), "\n") { + path := strings.TrimSpace(line) + if path == "" { + continue + } + + mightContain, err := filter.MightContain([]byte(path)) + if err != nil { + tb.Fatalf("MightContain(%q): %v", path, err) + } + + if !mightContain { + tb.Fatalf("Bloom filter false negative for commit %s path %q", commitID, path) + } + } +} + +func parseOIDLine(tb testing.TB, algo objectid.Algorithm, line string) []objectid.ObjectID { + tb.Helper() + + toks := strings.Fields(line) + + out := make([]objectid.ObjectID, 0, len(toks)) + for _, tok := range toks { + id, err := objectid.ParseHex(algo, tok) + if err != nil { + tb.Fatalf("parse object id %q: %v", tok, err) + } + + out = append(out, id) + } + + return out +} diff --git a/format/commitgraph/reader.go b/format/commitgraph/reader.go new file mode 100644 index 00000000..b7af3282 --- /dev/null +++ b/format/commitgraph/reader.go @@ -0,0 +1,14 @@ +package commitgraph + +import "codeberg.org/lindenii/furgit/objectid" + +// Reader provides read-only access to one mmap-backed commit-graph snapshot. +// +// It is safe for concurrent read-only queries. +type Reader struct { + algo objectid.Algorithm + hashVersion uint8 + + layers []layer + total uint32 +} diff --git a/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/HEAD b/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/HEAD new file mode 100644 index 00000000..cb089cd8 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/config b/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/config new file mode 100644 index 00000000..07d359d0 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/config @@ -0,0 +1,4 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true diff --git a/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/info/commit-graphs/commit-graph-chain b/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/info/commit-graphs/commit-graph-chain new file mode 100644 index 00000000..74c46b64 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/info/commit-graphs/commit-graph-chain @@ -0,0 +1,2 @@ +dd7578d5216ca76c25b19631ba90f7498aeabbe7 +bf985c21612a52070d8b008e6ef51edf8b609401 diff --git a/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/info/commit-graphs/graph-bf985c21612a52070d8b008e6ef51edf8b609401.graph b/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/info/commit-graphs/graph-bf985c21612a52070d8b008e6ef51edf8b609401.graph Binary files differnew file mode 100644 index 00000000..c31869c1 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/info/commit-graphs/graph-bf985c21612a52070d8b008e6ef51edf8b609401.graph diff --git a/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/info/commit-graphs/graph-dd7578d5216ca76c25b19631ba90f7498aeabbe7.graph b/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/info/commit-graphs/graph-dd7578d5216ca76c25b19631ba90f7498aeabbe7.graph Binary files differnew file mode 100644 index 00000000..241eb3cc --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/info/commit-graphs/graph-dd7578d5216ca76c25b19631ba90f7498aeabbe7.graph diff --git a/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/info/packs b/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/info/packs new file mode 100644 index 00000000..61decf9b --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/info/packs @@ -0,0 +1,2 @@ +P pack-15b064d6a8ef8cff520565f6db8c006b2e6f7f2f.pack + diff --git a/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/pack/pack-15b064d6a8ef8cff520565f6db8c006b2e6f7f2f.bitmap b/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/pack/pack-15b064d6a8ef8cff520565f6db8c006b2e6f7f2f.bitmap Binary files differnew file mode 100644 index 00000000..1508cf18 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/pack/pack-15b064d6a8ef8cff520565f6db8c006b2e6f7f2f.bitmap diff --git a/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/pack/pack-15b064d6a8ef8cff520565f6db8c006b2e6f7f2f.idx b/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/pack/pack-15b064d6a8ef8cff520565f6db8c006b2e6f7f2f.idx Binary files differnew file mode 100644 index 00000000..00ee2646 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/pack/pack-15b064d6a8ef8cff520565f6db8c006b2e6f7f2f.idx diff --git a/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/pack/pack-15b064d6a8ef8cff520565f6db8c006b2e6f7f2f.pack b/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/pack/pack-15b064d6a8ef8cff520565f6db8c006b2e6f7f2f.pack Binary files differnew file mode 100644 index 00000000..c65ae27f --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/pack/pack-15b064d6a8ef8cff520565f6db8c006b2e6f7f2f.pack diff --git a/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/pack/pack-15b064d6a8ef8cff520565f6db8c006b2e6f7f2f.rev b/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/pack/pack-15b064d6a8ef8cff520565f6db8c006b2e6f7f2f.rev Binary files differnew file mode 100644 index 00000000..d0689f72 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/objects/pack/pack-15b064d6a8ef8cff520565f6db8c006b2e6f7f2f.rev diff --git a/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/refs/heads/master b/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/refs/heads/master new file mode 100644 index 00000000..8942d437 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/chain_changed/repo.git/refs/heads/master @@ -0,0 +1 @@ +46ca641fd65e566b8ecfa567a1f01766289192f8 diff --git a/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/HEAD b/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/HEAD new file mode 100644 index 00000000..b870d826 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/main diff --git a/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/config b/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/config new file mode 100644 index 00000000..07d359d0 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/config @@ -0,0 +1,4 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true diff --git a/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/objects/info/commit-graph b/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/objects/info/commit-graph Binary files differnew file mode 100644 index 00000000..56b59a54 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/objects/info/commit-graph diff --git a/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/objects/info/packs b/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/objects/info/packs new file mode 100644 index 00000000..ecf5d272 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/objects/info/packs @@ -0,0 +1,2 @@ +P pack-34e9e132566989e2abfe8821731236c77f9bcbe9.pack + diff --git a/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/objects/pack/pack-34e9e132566989e2abfe8821731236c77f9bcbe9.bitmap b/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/objects/pack/pack-34e9e132566989e2abfe8821731236c77f9bcbe9.bitmap Binary files differnew file mode 100644 index 00000000..9fec7b16 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/objects/pack/pack-34e9e132566989e2abfe8821731236c77f9bcbe9.bitmap diff --git a/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/objects/pack/pack-34e9e132566989e2abfe8821731236c77f9bcbe9.idx b/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/objects/pack/pack-34e9e132566989e2abfe8821731236c77f9bcbe9.idx Binary files differnew file mode 100644 index 00000000..e30cbb5a --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/objects/pack/pack-34e9e132566989e2abfe8821731236c77f9bcbe9.idx diff --git a/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/objects/pack/pack-34e9e132566989e2abfe8821731236c77f9bcbe9.pack b/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/objects/pack/pack-34e9e132566989e2abfe8821731236c77f9bcbe9.pack Binary files differnew file mode 100644 index 00000000..8da45eab --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/objects/pack/pack-34e9e132566989e2abfe8821731236c77f9bcbe9.pack diff --git a/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/objects/pack/pack-34e9e132566989e2abfe8821731236c77f9bcbe9.rev b/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/objects/pack/pack-34e9e132566989e2abfe8821731236c77f9bcbe9.rev Binary files differnew file mode 100644 index 00000000..3bcd2e2c --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/objects/pack/pack-34e9e132566989e2abfe8821731236c77f9bcbe9.rev diff --git a/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/refs/heads/main b/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/refs/heads/main new file mode 100644 index 00000000..090ca933 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/single_changed/repo.git/refs/heads/main @@ -0,0 +1 @@ +d02a8dbd1a8fbaac8ab7f7f1533cc312ab2c9eec diff --git a/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/HEAD b/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/HEAD new file mode 100644 index 00000000..cb089cd8 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/config b/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/config new file mode 100644 index 00000000..07d359d0 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/config @@ -0,0 +1,4 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true diff --git a/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/objects/info/commit-graph b/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/objects/info/commit-graph Binary files differnew file mode 100644 index 00000000..28f7d06a --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/objects/info/commit-graph diff --git a/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/objects/info/packs b/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/objects/info/packs new file mode 100644 index 00000000..8434a002 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/objects/info/packs @@ -0,0 +1,2 @@ +P pack-a3da595034c94bb16b6829d757a66b7d259b9ffc.pack + diff --git a/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/objects/pack/pack-a3da595034c94bb16b6829d757a66b7d259b9ffc.bitmap b/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/objects/pack/pack-a3da595034c94bb16b6829d757a66b7d259b9ffc.bitmap Binary files differnew file mode 100644 index 00000000..64a36c71 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/objects/pack/pack-a3da595034c94bb16b6829d757a66b7d259b9ffc.bitmap diff --git a/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/objects/pack/pack-a3da595034c94bb16b6829d757a66b7d259b9ffc.idx b/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/objects/pack/pack-a3da595034c94bb16b6829d757a66b7d259b9ffc.idx Binary files differnew file mode 100644 index 00000000..f5e16674 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/objects/pack/pack-a3da595034c94bb16b6829d757a66b7d259b9ffc.idx diff --git a/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/objects/pack/pack-a3da595034c94bb16b6829d757a66b7d259b9ffc.pack b/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/objects/pack/pack-a3da595034c94bb16b6829d757a66b7d259b9ffc.pack Binary files differnew file mode 100644 index 00000000..8f82b451 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/objects/pack/pack-a3da595034c94bb16b6829d757a66b7d259b9ffc.pack diff --git a/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/objects/pack/pack-a3da595034c94bb16b6829d757a66b7d259b9ffc.rev b/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/objects/pack/pack-a3da595034c94bb16b6829d757a66b7d259b9ffc.rev Binary files differnew file mode 100644 index 00000000..64771f70 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/objects/pack/pack-a3da595034c94bb16b6829d757a66b7d259b9ffc.rev diff --git a/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/refs/heads/master b/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/refs/heads/master new file mode 100644 index 00000000..475cb2c1 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha1/single_nochanged/repo.git/refs/heads/master @@ -0,0 +1 @@ +dda8217252bdf3e01fdf31309d0e5c3051b00945 diff --git a/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/HEAD b/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/HEAD new file mode 100644 index 00000000..cb089cd8 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/config b/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/config new file mode 100644 index 00000000..7d1c0006 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/config @@ -0,0 +1,6 @@ +[extensions] + objectformat = sha256 +[core] + repositoryformatversion = 1 + filemode = true + bare = true diff --git a/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/info/commit-graphs/commit-graph-chain b/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/info/commit-graphs/commit-graph-chain new file mode 100644 index 00000000..4e7d76fe --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/info/commit-graphs/commit-graph-chain @@ -0,0 +1,2 @@ +505cab61f8ddfa614301e8f97943112739236c6bcd19ed4d1f7c6b830cab4f62 +77c47bd6ca2ce17208c9361717a5823c0cb4b5ee336a14959678e060d674ffb6 diff --git a/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/info/commit-graphs/graph-505cab61f8ddfa614301e8f97943112739236c6bcd19ed4d1f7c6b830cab4f62.graph b/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/info/commit-graphs/graph-505cab61f8ddfa614301e8f97943112739236c6bcd19ed4d1f7c6b830cab4f62.graph Binary files differnew file mode 100644 index 00000000..4a93de94 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/info/commit-graphs/graph-505cab61f8ddfa614301e8f97943112739236c6bcd19ed4d1f7c6b830cab4f62.graph diff --git a/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/info/commit-graphs/graph-77c47bd6ca2ce17208c9361717a5823c0cb4b5ee336a14959678e060d674ffb6.graph b/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/info/commit-graphs/graph-77c47bd6ca2ce17208c9361717a5823c0cb4b5ee336a14959678e060d674ffb6.graph Binary files differnew file mode 100644 index 00000000..7807351d --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/info/commit-graphs/graph-77c47bd6ca2ce17208c9361717a5823c0cb4b5ee336a14959678e060d674ffb6.graph diff --git a/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/info/packs b/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/info/packs new file mode 100644 index 00000000..3b1241c4 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/info/packs @@ -0,0 +1,2 @@ +P pack-04168d0884c910f505cb9fbcf045957e44ccee06d812b5e531ae666014a26ed1.pack + diff --git a/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/pack/pack-04168d0884c910f505cb9fbcf045957e44ccee06d812b5e531ae666014a26ed1.bitmap b/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/pack/pack-04168d0884c910f505cb9fbcf045957e44ccee06d812b5e531ae666014a26ed1.bitmap Binary files differnew file mode 100644 index 00000000..007fcd0e --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/pack/pack-04168d0884c910f505cb9fbcf045957e44ccee06d812b5e531ae666014a26ed1.bitmap diff --git a/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/pack/pack-04168d0884c910f505cb9fbcf045957e44ccee06d812b5e531ae666014a26ed1.idx b/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/pack/pack-04168d0884c910f505cb9fbcf045957e44ccee06d812b5e531ae666014a26ed1.idx Binary files differnew file mode 100644 index 00000000..248cf8fc --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/pack/pack-04168d0884c910f505cb9fbcf045957e44ccee06d812b5e531ae666014a26ed1.idx diff --git a/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/pack/pack-04168d0884c910f505cb9fbcf045957e44ccee06d812b5e531ae666014a26ed1.pack b/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/pack/pack-04168d0884c910f505cb9fbcf045957e44ccee06d812b5e531ae666014a26ed1.pack Binary files differnew file mode 100644 index 00000000..92cea7fb --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/pack/pack-04168d0884c910f505cb9fbcf045957e44ccee06d812b5e531ae666014a26ed1.pack diff --git a/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/pack/pack-04168d0884c910f505cb9fbcf045957e44ccee06d812b5e531ae666014a26ed1.rev b/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/pack/pack-04168d0884c910f505cb9fbcf045957e44ccee06d812b5e531ae666014a26ed1.rev Binary files differnew file mode 100644 index 00000000..569862ce --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/objects/pack/pack-04168d0884c910f505cb9fbcf045957e44ccee06d812b5e531ae666014a26ed1.rev diff --git a/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/refs/heads/master b/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/refs/heads/master new file mode 100644 index 00000000..29d83be8 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/chain_changed/repo.git/refs/heads/master @@ -0,0 +1 @@ +10d2943dc7ad88011cae3b776d9565d6451a350ce1d16949bc8546a5fe6c0a53 diff --git a/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/HEAD b/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/HEAD new file mode 100644 index 00000000..b870d826 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/main diff --git a/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/config b/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/config new file mode 100644 index 00000000..7d1c0006 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/config @@ -0,0 +1,6 @@ +[extensions] + objectformat = sha256 +[core] + repositoryformatversion = 1 + filemode = true + bare = true diff --git a/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/objects/info/commit-graph b/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/objects/info/commit-graph Binary files differnew file mode 100644 index 00000000..f4dd0e0c --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/objects/info/commit-graph diff --git a/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/objects/info/packs b/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/objects/info/packs new file mode 100644 index 00000000..0f39ed89 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/objects/info/packs @@ -0,0 +1,2 @@ +P pack-316dbc67dac12d131591640da0c55b76387cbf1fd2a117ab3d7ca0d854a031c9.pack + diff --git a/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/objects/pack/pack-316dbc67dac12d131591640da0c55b76387cbf1fd2a117ab3d7ca0d854a031c9.bitmap b/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/objects/pack/pack-316dbc67dac12d131591640da0c55b76387cbf1fd2a117ab3d7ca0d854a031c9.bitmap Binary files differnew file mode 100644 index 00000000..b5c5055c --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/objects/pack/pack-316dbc67dac12d131591640da0c55b76387cbf1fd2a117ab3d7ca0d854a031c9.bitmap diff --git a/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/objects/pack/pack-316dbc67dac12d131591640da0c55b76387cbf1fd2a117ab3d7ca0d854a031c9.idx b/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/objects/pack/pack-316dbc67dac12d131591640da0c55b76387cbf1fd2a117ab3d7ca0d854a031c9.idx Binary files differnew file mode 100644 index 00000000..144778cd --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/objects/pack/pack-316dbc67dac12d131591640da0c55b76387cbf1fd2a117ab3d7ca0d854a031c9.idx diff --git a/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/objects/pack/pack-316dbc67dac12d131591640da0c55b76387cbf1fd2a117ab3d7ca0d854a031c9.pack b/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/objects/pack/pack-316dbc67dac12d131591640da0c55b76387cbf1fd2a117ab3d7ca0d854a031c9.pack Binary files differnew file mode 100644 index 00000000..599ccae0 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/objects/pack/pack-316dbc67dac12d131591640da0c55b76387cbf1fd2a117ab3d7ca0d854a031c9.pack diff --git a/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/objects/pack/pack-316dbc67dac12d131591640da0c55b76387cbf1fd2a117ab3d7ca0d854a031c9.rev b/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/objects/pack/pack-316dbc67dac12d131591640da0c55b76387cbf1fd2a117ab3d7ca0d854a031c9.rev Binary files differnew file mode 100644 index 00000000..3c093f31 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/objects/pack/pack-316dbc67dac12d131591640da0c55b76387cbf1fd2a117ab3d7ca0d854a031c9.rev diff --git a/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/refs/heads/main b/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/refs/heads/main new file mode 100644 index 00000000..4ba32358 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/single_changed/repo.git/refs/heads/main @@ -0,0 +1 @@ +a9ff114900e6be139ec66a2a61c930973d8c4bc6fd3b899405ee7ab8740bdbd3 diff --git a/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/HEAD b/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/HEAD new file mode 100644 index 00000000..cb089cd8 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/config b/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/config new file mode 100644 index 00000000..7d1c0006 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/config @@ -0,0 +1,6 @@ +[extensions] + objectformat = sha256 +[core] + repositoryformatversion = 1 + filemode = true + bare = true diff --git a/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/objects/info/commit-graph b/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/objects/info/commit-graph Binary files differnew file mode 100644 index 00000000..f98ca4a1 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/objects/info/commit-graph diff --git a/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/objects/info/packs b/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/objects/info/packs new file mode 100644 index 00000000..65184c9a --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/objects/info/packs @@ -0,0 +1,2 @@ +P pack-d335453f760b064e36459d780ec9bf0e5dd596c0ee1ac6310136067c4f13438b.pack + diff --git a/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/objects/pack/pack-d335453f760b064e36459d780ec9bf0e5dd596c0ee1ac6310136067c4f13438b.bitmap b/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/objects/pack/pack-d335453f760b064e36459d780ec9bf0e5dd596c0ee1ac6310136067c4f13438b.bitmap Binary files differnew file mode 100644 index 00000000..53530f4c --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/objects/pack/pack-d335453f760b064e36459d780ec9bf0e5dd596c0ee1ac6310136067c4f13438b.bitmap diff --git a/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/objects/pack/pack-d335453f760b064e36459d780ec9bf0e5dd596c0ee1ac6310136067c4f13438b.idx b/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/objects/pack/pack-d335453f760b064e36459d780ec9bf0e5dd596c0ee1ac6310136067c4f13438b.idx Binary files differnew file mode 100644 index 00000000..b3a417a8 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/objects/pack/pack-d335453f760b064e36459d780ec9bf0e5dd596c0ee1ac6310136067c4f13438b.idx diff --git a/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/objects/pack/pack-d335453f760b064e36459d780ec9bf0e5dd596c0ee1ac6310136067c4f13438b.pack b/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/objects/pack/pack-d335453f760b064e36459d780ec9bf0e5dd596c0ee1ac6310136067c4f13438b.pack Binary files differnew file mode 100644 index 00000000..d8dcedbf --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/objects/pack/pack-d335453f760b064e36459d780ec9bf0e5dd596c0ee1ac6310136067c4f13438b.pack diff --git a/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/objects/pack/pack-d335453f760b064e36459d780ec9bf0e5dd596c0ee1ac6310136067c4f13438b.rev b/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/objects/pack/pack-d335453f760b064e36459d780ec9bf0e5dd596c0ee1ac6310136067c4f13438b.rev Binary files differnew file mode 100644 index 00000000..e50d1a81 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/objects/pack/pack-d335453f760b064e36459d780ec9bf0e5dd596c0ee1ac6310136067c4f13438b.rev diff --git a/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/refs/heads/master b/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/refs/heads/master new file mode 100644 index 00000000..a4e184b4 --- /dev/null +++ b/format/commitgraph/testdata/fixtures/sha256/single_nochanged/repo.git/refs/heads/master @@ -0,0 +1 @@ +7e396bf648e3b045c293d9fbdc533d4377d4e801d5d1fb57b84d22dd054a5860 diff --git a/internal/intconv/intconv.go b/internal/intconv/intconv.go index ab9d5c63..08530265 100644 --- a/internal/intconv/intconv.go +++ b/internal/intconv/intconv.go @@ -86,3 +86,12 @@ func Uint32ToUint8(v uint32) (uint8, error) { return uint8(v), nil } + +// Uint32ToInt converts v to int, returning an error if it overflows. +func Uint32ToInt(v uint32) (int, error) { + if uint64(v) > uint64(math.MaxInt) { + return 0, fmt.Errorf("intconv: uint32 %d overflows int", v) + } + + return int(v), nil +} diff --git a/internal/testgit/repo_commit_graph_write.go b/internal/testgit/repo_commit_graph_write.go new file mode 100644 index 00000000..13221f87 --- /dev/null +++ b/internal/testgit/repo_commit_graph_write.go @@ -0,0 +1,13 @@ +package testgit + +import "testing" + +// CommitGraphWrite runs "git commit-graph write" with args in the repository. +func (testRepo *TestRepo) CommitGraphWrite(tb testing.TB, args ...string) { + tb.Helper() + + cmdArgs := make([]string, 0, len(args)+3) + cmdArgs = append(cmdArgs, "commit-graph", "write") + cmdArgs = append(cmdArgs, args...) + _ = testRepo.Run(tb, cmdArgs...) +} diff --git a/internal/testgit/repo_from_fixture.go b/internal/testgit/repo_from_fixture.go new file mode 100644 index 00000000..887bf9a3 --- /dev/null +++ b/internal/testgit/repo_from_fixture.go @@ -0,0 +1,35 @@ +package testgit + +import ( + "io/fs" + "os" + "testing" + + "codeberg.org/lindenii/furgit/objectid" +) + +// NewRepoFromFixture copies one existing repository fixture into a temp dir. +func NewRepoFromFixture(tb testing.TB, algo objectid.Algorithm, fixtureDir string) *TestRepo { + tb.Helper() + + if algo.Size() == 0 { + tb.Fatalf("invalid algorithm: %v", algo) + } + + dst := tb.TempDir() + srcFS := os.DirFS(fixtureDir) + err := copyFS(dst, srcFS) + if err != nil { + tb.Fatalf("copy fixture %q: %v", fixtureDir, err) + } + + return &TestRepo{ + dir: dst, + algo: algo, + env: defaultEnv(), + } +} + +func copyFS(dst string, src fs.FS) error { + return os.CopyFS(dst, src) +} diff --git a/internal/testgit/repo_new.go b/internal/testgit/repo_new.go index 8a71e406..4ae80393 100644 --- a/internal/testgit/repo_new.go +++ b/internal/testgit/repo_new.go @@ -32,16 +32,7 @@ func NewRepo(tb testing.TB, opts RepoOptions) *TestRepo { testRepo := &TestRepo{ dir: dir, algo: algo, - env: append(os.Environ(), - "GIT_CONFIG_GLOBAL=/dev/null", - "GIT_CONFIG_SYSTEM=/dev/null", - "GIT_AUTHOR_NAME=Test Author", - "GIT_AUTHOR_EMAIL=test@example.org", - "GIT_COMMITTER_NAME=Test Committer", - "GIT_COMMITTER_EMAIL=committer@example.org", - "GIT_AUTHOR_DATE=1234567890 +0000", - "GIT_COMMITTER_DATE=1234567890 +0000", - ), + env: defaultEnv(), } args := []string{"init", "--object-format=" + algo.String()} @@ -58,3 +49,16 @@ func NewRepo(tb testing.TB, opts RepoOptions) *TestRepo { return testRepo } + +func defaultEnv() []string { + return append(os.Environ(), + "GIT_CONFIG_GLOBAL=/dev/null", + "GIT_CONFIG_SYSTEM=/dev/null", + "GIT_AUTHOR_NAME=Test Author", + "GIT_AUTHOR_EMAIL=test@example.org", + "GIT_COMMITTER_NAME=Test Committer", + "GIT_COMMITTER_EMAIL=committer@example.org", + "GIT_AUTHOR_DATE=1234567890 +0000", + "GIT_COMMITTER_DATE=1234567890 +0000", + ) +} diff --git a/internal/testgit/repo_properties.go b/internal/testgit/repo_properties.go index 47123ee8..3a489124 100644 --- a/internal/testgit/repo_properties.go +++ b/internal/testgit/repo_properties.go @@ -11,3 +11,8 @@ func (testRepo *TestRepo) Dir() string { func (testRepo *TestRepo) Algorithm() objectid.Algorithm { return testRepo.algo } + +// Env returns a copy of the environment used for git subprocesses. +func (testRepo *TestRepo) Env() []string { + return append([]string(nil), testRepo.env...) +} diff --git a/internal/testgit/repo_rev_list.go b/internal/testgit/repo_rev_list.go new file mode 100644 index 00000000..d3adf5a0 --- /dev/null +++ b/internal/testgit/repo_rev_list.go @@ -0,0 +1,37 @@ +package testgit + +import ( + "strings" + "testing" + + "codeberg.org/lindenii/furgit/objectid" +) + +// RevList runs "git rev-list" with args and parses one object ID per line. +func (testRepo *TestRepo) RevList(tb testing.TB, args ...string) []objectid.ObjectID { + tb.Helper() + + cmdArgs := make([]string, 0, len(args)+1) + cmdArgs = append(cmdArgs, "rev-list") + cmdArgs = append(cmdArgs, args...) + out := testRepo.Run(tb, cmdArgs...) + + lines := strings.Split(strings.TrimSpace(out), "\n") + + outIDs := make([]objectid.ObjectID, 0, len(lines)) + for _, line := range lines { + line = strings.TrimSpace(line) + if line == "" { + continue + } + + id, err := objectid.ParseHex(testRepo.algo, line) + if err != nil { + tb.Fatalf("parse rev-list oid %q: %v", line, err) + } + + outIDs = append(outIDs, id) + } + + return outIDs +} |