stakk 1.11.0

A CLI tool that bridges Jujutsu (jj) bookmarks to GitHub stacked pull requests
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89

//! Data types for change graph construction.

use std::collections::HashMap;
use std::collections::HashSet;

use crate::jj::types::Signature;

/// A commit within a bookmark segment, carrying metadata needed for display
/// and later PR creation.
#[derive(Debug, Clone)]
pub struct SegmentCommit {
    pub commit_id: String,
    pub change_id: String,
    pub description: String,
    pub author: Signature,
    pub committer: Signature,
    /// Shortest unique change ID prefix (from jj).
    pub short_change_id: String,
    /// Files changed by this commit.
    pub files: Vec<String>,
}

/// A group of consecutive commits belonging to one or more bookmarks.
///
/// When multiple bookmarks point at the same change, they share one segment.
/// Commits are ordered newest-first (the bookmarked commit is first).
#[derive(Debug, Clone)]
pub struct BookmarkSegment {
    /// Bookmark names pointing at this segment's change.
    pub bookmark_names: Vec<String>,
    /// The change ID that the bookmarks point to.
    pub change_id: String,
    /// Commits in this segment (newest first). The first commit is the one the
    /// bookmarks point at.
    pub commits: Vec<SegmentCommit>,
}

/// A complete path from trunk to a leaf bookmark.
///
/// Segments are ordered bottom-to-top: the first segment is closest to trunk,
/// the last is the leaf.
#[derive(Debug, Clone)]
pub struct BranchStack {
    pub segments: Vec<BookmarkSegment>,
}

/// The complete change graph: all bookmarked segments, their relationships,
/// and the resulting stacks.
#[derive(Debug)]
pub struct ChangeGraph {
    /// Child `change_id` → parent `change_id` (toward trunk). Each entry
    /// represents a stacking relationship between two bookmarked changes.
    pub adjacency_list: HashMap<String, String>,

    /// Change IDs that are leaf nodes (no children point to them as parent).
    /// Each leaf defines one stack.
    pub stack_leaves: HashSet<String>,

    /// Change IDs closest to trunk with no parent in the adjacency list.
    #[cfg_attr(
        not(test),
        expect(dead_code, reason = "available for interactive mode or diagnostics")
    )]
    pub stack_roots: HashSet<String>,

    /// Map from `change_id` to its `BookmarkSegment`.
    #[cfg_attr(
        not(test),
        expect(
            dead_code,
            reason = "used during graph construction; exposed for diagnostics"
        )
    )]
    pub segments: HashMap<String, BookmarkSegment>,

    /// Change IDs of merge commits and their descendants, excluded from
    /// stacking.
    #[cfg_attr(
        not(test),
        expect(dead_code, reason = "used in later milestones for diagnostics")
    )]
    pub tainted_change_ids: HashSet<String>,

    /// Number of bookmarks excluded due to merge commits in their history.
    pub excluded_bookmark_count: usize,

    /// Complete stacks, one per leaf bookmark, ordered trunk-to-leaf.
    pub stacks: Vec<BranchStack>,
}