merge: fix lint after latest main integration

7c9aeab→main·

dipree·3w ago·4 files·+16 added/-12 removed

Sessions

3e6be7f46bc8View transcript

[?
Checkout the hand off doc that I just added.Pi·Opus 4.8·5 steps](/content/gh/entireio/cli/session/019eca64-8c2c-7b00-90c6-3aa49738c497#timeline-3e6be7f46bc8/index.html)

Changes

4

• cmd/entire/cli

• checkpoint

• Mopen.go+3/-1

• Mreview_bridge.go+7/-7

• Mreview_bridge_test.go+1/-1

• strategy

• Mmanual_commit_opf_rewrite.go+5/-3

54 unmodified lines

55
56
57
58
58
59
60
61
62
63

54 unmodified lines

}

// Temporary returns the git-backed temporary shadow-branch store.
func (s *Stores) Temporary() TemporaryStore { return s.temporary } //nolint:ireturn // temporary store capability is the abstraction boundary
//
//nolint:ireturn // temporary store capability is the abstraction boundary
func (s *Stores) Temporary() TemporaryStore { return s.temporary }

// Refs returns the resolved committed-ref topology.
func (s *Stores) Refs() CommittedRefs { return s.refs }

Mcmd/entire/cli/checkpoint/open.go+3/-1

231 unmodified lines

232
233
234
235
235
236
237
237
238
239
239
240
241
242
3 unmodified lines

246
247
248
249
249
250
251
252
252
253
254
254
255
256
256
257
258
259

231 unmodified lines

}
    switch {
    case strings.Contains(prefix, "[p0]") || strings.Contains(prefix, "[p1]") || strings.Contains(prefix, "[high]") || strings.Contains(prefix, "critical"):
        return stringPtr("high")
        return stringPtr(trailReviewSeverityHigh)
    case strings.Contains(prefix, "[p2]") || strings.Contains(prefix, "[medium]"):
        return stringPtr("medium")
        return stringPtr(trailReviewSeverityMedium)
    case strings.Contains(prefix, "[p3]") || strings.Contains(prefix, "[low]") || strings.Contains(prefix, "[nit]") || strings.Contains(prefix, "nit:"):
        return stringPtr("low")
        return stringPtr(trailReviewSeverityLow)
    default:
        return nil
    }
3 unmodified lines

s := strings.ToLower(strings.TrimSpace(raw))
    s = strings.Trim(s, "{}:*_ ")
    switch s {
    case "high", "medium", "low":
    case trailReviewSeverityHigh, trailReviewSeverityMedium, trailReviewSeverityLow:
        return stringPtr(s)
    case "p0", "p1", "critical":
        return stringPtr("high")
        return stringPtr(trailReviewSeverityHigh)
    case "p2":
        return stringPtr("medium")
        return stringPtr(trailReviewSeverityMedium)
    case "p3", "nit", "nits":
        return stringPtr("low")
        return stringPtr(trailReviewSeverityLow)
    default:
        return nil
    }

Mcmd/entire/cli/review_bridge.go+7/-7

48 unmodified lines

49
50
51
52
52
53
54
55

48 unmodified lines

}
    bodies := make([]string, len(inputs))
    for i, in := range inputs {
        if in.Location.Granularity != "line" {
        if in.Location.Granularity != reviewTrailGranularityLine {
            t.Fatalf("input %d granularity = %q, want line", i, in.Location.Granularity)
        }
        if in.Location.FilePath == nil || in.Location.StartLine == nil {

Mcmd/entire/cli/review_bridge_test.go+1/-1

558 unmodified lines

559
560
561
562
562
563
564
565
20 unmodified lines

586
587
588
589
590
591
592
593
34 unmodified lines

628
629
630
629
631
632
633
634
39 unmodified lines

674
675
676
675
677
678
679
680

558 unmodified lines

// walker to find each blob's redacted bytes in the cached map.
func collectTreeBlobs(repo *git.Repository, tree *object.Tree, pathPrefix string, blobs *[]redact.NamedBlob, paths *[]string) error {
    for _, e := range tree.Entries {
        switch e.Mode { //nolint:exhaustive // non-tree/blob modes are unreachable here
        switch e.Mode {
        case filemode.Dir:
            subPath := e.Name
            if pathPrefix != "" {
20 unmodified lines

}
            *blobs = append(*blobs, redact.NamedBlob{Name: e.Name, Content: content})
            *paths = append(*paths, fullPath)
        case filemode.Empty, filemode.Deprecated, filemode.Symlink, filemode.Submodule:
            // Non-blob/non-tree entries are not redactable blobs.
        }
    }
    return nil
}

var newFullJSONLHash plumbing.Hash

for _, e := range tree.Entries { switch e.Mode { //nolint:exhaustive // non-tree/blob modes fall through to copy switch e.Mode { case filemode.Dir: subPath := e.Name if pathPrefix != "" { 39 unmodified lines

newFullJSONLHash = newHash } } default: case filemode.Empty, filemode.Deprecated, filemode.Symlink, filemode.Submodule: entries = append(entries, e) } }