Artifact 38a38f67de1c666f12e491a3e9c2dd2b408770c56e0a3af156388f89e0fd5a37:
- File
internal/deck/parse.go
— part of check-in
[7764ecf6ff]
at
2026-07-22 23:16:39
on branch trunk
— fix: correct stale module path in internal/deck/parse.go (#122)
The internal/hash import was added by the #93 T-card validation fix on a branch cut before the go-libfossil module rename merged. The rename's automated rewrite only touched import lines that existed at the time, so this newly-added import kept the old path and broke go build ./... on main after both merged.
CI's go build ./cmd/libfossil/ and go test $(go list ./... | grep -v /dst) didn't catch it: go list ./... drops a package that fails to compile from its output rather than failing the command, so the broken package silently dropped out of the test run instead of failing the build. (user: [email protected], size: 11595) [annotate] [blame] [check-ins using]
package deck import ( "bytes" "fmt" "strconv" "strings" "time" "github.com/danmestas/go-libfossil/internal/hash" ) // isHexToken reports whether s is non-empty and consists solely of the // lowercase hex digits an artifact hash is built from. §4.7.16 rejects a // T-card name that is entirely hex because it is indistinguishable from a // hash target. func isHexToken(s string) bool { if s == "" { return false } for i := 0; i < len(s); i++ { c := s[i] isHexDigit := (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') if !isHexDigit { return false } } return true } func Parse(data []byte) (*Deck, error) { if data == nil { panic("deck.Parse: data must not be nil") } if err := VerifyZ(data); err != nil { return nil, fmt.Errorf("deck.Parse: %w", err) } // body is safe: VerifyZ above guarantees len(data) >= 35. body := data[:len(data)-35] d := &Deck{} var lastCard byte var seen seenCards reader := bytes.NewReader(body) for reader.Len() > 0 { line, err := readLine(reader) if err != nil || len(line) == 0 { continue } card := line[0] // §4.5.1 occurrence classes. The card-type ordering check below // permits equal consecutive letters, so the duplicate guard for // single-occurrence types has to be separate from it. W is // single-occurrence too, so the claim precedes the W branch. if err := seen.claim(card); err != nil { return nil, fmt.Errorf("deck.Parse: %w", err) } if card == 'W' { if card < lastCard { return nil, fmt.Errorf("deck.Parse: card 'W' out of order (after '%c')", lastCard) } lastCard = card sizeStr := strings.TrimSpace(line[2:]) size, err := strconv.Atoi(sizeStr) if err != nil { return nil, fmt.Errorf("deck.Parse: bad W size: %w", err) } content := make([]byte, size) n, readErr := reader.Read(content) if readErr != nil && n != size { return nil, fmt.Errorf("deck.Parse: W content read: %w", readErr) } if n != size { return nil, fmt.Errorf("deck.Parse: W content: got %d, want %d", n, size) } reader.ReadByte() // trailing newline d.W = content continue } if card < lastCard { return nil, fmt.Errorf("deck.Parse: card '%c' out of order (after '%c')", card, lastCard) } lastCard = card if len(line) < 2 || line[1] != ' ' { return nil, fmt.Errorf("deck.Parse: malformed: %q", line) } args := line[2:] if err := parseCard(d, card, args); err != nil { return nil, fmt.Errorf("deck.Parse: %w", err) } } d.Type = inferType(d) return d, nil } func readLine(r *bytes.Reader) (string, error) { var b strings.Builder for { c, err := r.ReadByte() if err != nil { return b.String(), nil } if c == '\n' { return b.String(), nil } b.WriteByte(c) } } func parseCard(d *Deck, card byte, args string) error { if d == nil { panic("deck.parseCard: d must not be nil") } switch card { case 'A': return parseACard(d, args) case 'D': return parseDCard(d, args) case 'E': return parseECard(d, args) case 'F': return parseFCard(d, args) case 'J': return parseJCard(d, args) case 'Q': return parseQCard(d, args) case 'T': return parseTCard(d, args) // Simple cards stay inline: case 'B': d.B = strings.TrimSpace(args) return nil case 'C': d.C = FossilDecode(args) return nil case 'G': d.G = strings.TrimSpace(args) return nil case 'H': d.H = FossilDecode(args) return nil case 'I': d.I = strings.TrimSpace(args) return nil case 'K': d.K = strings.TrimSpace(args) return nil case 'L': d.L = FossilDecode(args) return nil case 'M': return parseMCard(d, args) case 'N': d.N = strings.TrimSpace(args) return nil case 'P': // Repeatable, and neither sorted nor deduplicated (§4.5.2): P // order is semantic, primary parent first. Appending — not // assigning — is what makes a second P card add parents rather // than replace them (§4.5.1). d.P = append(d.P, strings.Fields(args)...) return nil case 'R': d.R = strings.TrimSpace(args) return nil case 'U': return parseUCard(d, args) case 'Z': return parseZCard(args) default: return fmt.Errorf("unknown card '%c'", card) } } func parseACard(d *Deck, args string) error { parts := strings.SplitN(args, " ", 3) if len(parts) < 2 { return fmt.Errorf("A-card needs 2+ fields") } ac := &AttachmentCard{Filename: FossilDecode(parts[0]), Target: parts[1]} if len(parts) == 3 { ac.Source = parts[2] } d.A = ac return nil } func parseDCard(d *Deck, args string) error { t, err := parseTimestamp(args) if err != nil { return fmt.Errorf("D-card: %w", err) } d.D = t return nil } func parseECard(d *Deck, args string) error { parts := strings.SplitN(args, " ", 2) if len(parts) != 2 { return fmt.Errorf("E-card needs datetime and uuid") } t, err := parseTimestamp(parts[0]) if err != nil { return fmt.Errorf("E-card: %w", err) } d.E = &EventCard{Date: t, UUID: parts[1]} return nil } func parseFCard(d *Deck, args string) error { parts := strings.Fields(args) if len(parts) == 0 { return fmt.Errorf("empty F-card") } fc := FileCard{Name: FossilDecode(parts[0])} if len(parts) >= 2 { fc.UUID = parts[1] } if len(parts) >= 3 { fc.Perm = parts[2] } if len(parts) >= 4 { fc.OldName = FossilDecode(parts[3]) } // §4.5.2: strictly ascending by decoded filename. Decoding has already // happened above, so the check sees the post-decode name the merge walk // and baseline binary search of §8.2 will later rely on. if n := len(d.F); n > 0 { if err := requireAscending('F', d.F[n-1].Name, fc.Name); err != nil { return err } } d.F = append(d.F, fc) return nil } func parseMCard(d *Deck, args string) error { hash := strings.TrimSpace(args) // §4.5.2: strictly ascending by hash. if n := len(d.M); n > 0 { if err := requireAscending('M', d.M[n-1], hash); err != nil { return err } } d.M = append(d.M, hash) return nil } func parseJCard(d *Deck, args string) error { parts := strings.SplitN(args, " ", 2) // §4.7.8: the value is escape-decoded, the field name is stored // verbatim (canonical manifest.c defossilizes only zValue and compares // the raw zName). jf := TicketField{Name: parts[0]} if len(parts) == 2 { jf.Value = FossilDecode(parts[1]) } // §4.5.2: strictly ascending by field name. if n := len(d.J); n > 0 { if err := requireAscending('J', d.J[n-1].Name, jf.Name); err != nil { return err } } d.J = append(d.J, jf) return nil } func parseQCard(d *Deck, args string) error { if len(args) < 2 { return fmt.Errorf("Q-card too short") } cp := CherryPick{IsBackout: args[0] == '-'} rest := args[1:] parts := strings.SplitN(rest, " ", 2) cp.Target = parts[0] if len(parts) == 2 { cp.Baseline = parts[1] } d.Q = append(d.Q, cp) return nil } func parseTCard(d *Deck, args string) error { if len(args) < 2 { return fmt.Errorf("T-card too short") } // §4.7.16: the first character of the name token MUST be +, - or *. // Rejecting anything else also keeps the sign a single byte, so the // ordering key assembled from it cannot silently gain a second byte // through UTF-8 expansion. switch TagType(args[0]) { case TagSingleton, TagPropagating, TagCancel: default: return fmt.Errorf("T-card name must begin with '+', '-' or '*', got %q", args[:1]) } tc := TagCard{Type: TagType(args[0])} parts := strings.SplitN(args[1:], " ", 3) if len(parts) < 2 { return fmt.Errorf("T-card needs name and uuid") } // §4.7.16: the name and value tokens are escape-decoded (canonical // defossilizes both), while the target token is stored verbatim -- never // decoded on the way in, so it is never encoded on the way out. Decoding // the value matters on ordinary input: `fossil branch new 'my branch'` // writes `T *branch * my\sbranch`, and leaving that raw names the branch // literally "my\sbranch" all the way through crosslink. tc.Name = FossilDecode(parts[0]) tc.UUID = parts[1] if len(parts) == 3 { tc.Value = FossilDecode(parts[2]) } // §4.7.16: a name that after the sign is entirely hex digits is // ambiguous with a hash, so reject it. The escape-decoded name is used; // an all-hex token carries no escapes, so decoding leaves it unchanged. if isHexToken(tc.Name) { return fmt.Errorf("T-card name %q must not be entirely hexadecimal", tc.Name) } // §4.7.16: the target must be a valid artifact hash or the literal '*'. // hash.IsValidHash panics on an empty string, so the '*' and non-empty // checks come first. validTarget := tc.UUID == "*" if !validTarget && tc.UUID != "" { validTarget = hash.IsValidHash(tc.UUID) } if !validTarget { return fmt.Errorf("T-card target %q is neither a valid artifact hash nor '*'", tc.UUID) } if n := len(d.T); n > 0 { if err := requireTagAscending(d.T[n-1], tc); err != nil { return err } } d.T = append(d.T, tc) return nil } // requireTagAscending enforces the two-level T rule of §4.5.2: ascending by // tag name, then by target hash, with equal names requiring a strictly // increasing hash. Per §4.7.16 the primary key is the decoded full name // token including its leading sign character; tagOrderKey builds it. func requireTagAscending(previous, current TagCard) error { previousName := tagOrderKey(previous) currentName := tagOrderKey(current) switch cmp := Compare(currentName, previousName); { case cmp > 0: return nil case cmp < 0: return fmt.Errorf("T-card %q out of order after %q", currentName, previousName) default: if Compare(current.UUID, previous.UUID) > 0 { return nil } return fmt.Errorf("T-card %q target %q out of order after %q", currentName, current.UUID, previous.UUID) } } // parseUCard resolves the U-card's decoded value the same way fossil's // own parser does (src/manifest.c:1008-1016): a present-but-empty U-card // becomes the literal "anonymous". A wholly absent U-card never calls // this function at all, so d.U stays nil — the third state a bare string // field cannot represent. Resolving here, once, means every downstream // crosslink call site can bind d.U directly and get the right SQL value // (NULL, "anonymous", or the login) without repeating this logic. // // args is trimmed before the emptiness check, matching canonical fossil's // next_token() (which skips leading whitespace) and every sibling card // parser in this file (B/G/I/K/M/N/R all TrimSpace); otherwise a // whitespace-only U-card ("U \n") would store literal whitespace instead // of resolving to "anonymous". func parseUCard(d *Deck, args string) error { user := FossilDecode(strings.TrimSpace(args)) if user == "" { user = "anonymous" } d.U = &user return nil } func parseTimestamp(s string) (time.Time, error) { s = strings.TrimSpace(s) for _, layout := range []string{ "2006-01-02T15:04:05.000", "2006-01-02T15:04:05", } { if t, err := time.Parse(layout, s); err == nil { return t, nil } } s = strings.Replace(s, "t", "T", 1) for _, layout := range []string{ "2006-01-02T15:04:05.000", "2006-01-02T15:04:05", } { if t, err := time.Parse(layout, s); err == nil { return t, nil } } return time.Time{}, fmt.Errorf("cannot parse timestamp %q", s) } func inferType(d *Deck) ArtifactType { switch { case len(d.M) > 0: return Cluster case d.G != "" || d.H != "" || d.I != "": return ForumPost case d.A != nil: return Attachment case d.K != "": return Ticket case d.L != "": return Wiki case d.E != nil: return Event case len(d.F) > 0 || d.R != "": return Checkin case len(d.T) > 0: return Control default: return Checkin } }