jjpr 0.14.0

Manage stacked pull requests in Jujutsu repositories
Documentation 
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
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123

use anyhow::Result;

use crate::jj::types::{Bookmark, BookmarkSegment, NarrowedSegment};

/// When a segment has multiple bookmarks, the user must pick one for PR creation.
/// If running non-interactively, takes the first bookmark.
pub fn resolve_bookmark_selections(
    segments: &[BookmarkSegment],
    interactive: bool,
) -> Result<Vec<NarrowedSegment>> {
    segments
        .iter()
        .map(|segment| {
            let bookmark = if segment.bookmarks.len() == 1 {
                segment.bookmarks[0].clone()
            } else if segment.bookmarks.is_empty() {
                anyhow::bail!("segment has no bookmarks — this is an internal error");
            } else if interactive {
                select_bookmark_interactive(&segment.bookmarks)?
            } else {
                let chosen = &segment.bookmarks[0];
                eprintln!(
                    "  Using bookmark '{}' (multiple bookmarks on this change)",
                    chosen.name
                );
                chosen.clone()
            };

            Ok(NarrowedSegment {
                bookmark,
                changes: segment.changes.clone(),
                merge_source_names: segment.merge_source_names.clone(),
            })
        })
        .collect()
}

fn select_bookmark_interactive(bookmarks: &[Bookmark]) -> Result<Bookmark> {
    let names: Vec<&str> = bookmarks.iter().map(|b| b.name.as_str()).collect();

    let selection = dialoguer::Select::new()
        .with_prompt("Multiple bookmarks on this change — select one for the PR")
        .items(&names)
        .default(0)
        .interact()
        .map_err(|e| anyhow::anyhow!("selection cancelled: {e}"))?;

    Ok(bookmarks[selection].clone())
}

#[cfg(test)]
mod tests {
    use super::*;
    use crate::jj::types::LogEntry;

    fn bookmark(name: &str) -> Bookmark {
        Bookmark {
            name: name.to_string(),
            commit_id: format!("c_{name}"),
            change_id: format!("ch_{name}"),
            has_remote: false,
            is_synced: false,
        }
    }

    fn segment(bookmarks: Vec<Bookmark>) -> BookmarkSegment {
        BookmarkSegment {
            bookmarks,
            changes: vec![LogEntry {
                commit_id: "c1".to_string(),
                change_id: "ch1".to_string(),
                author_name: "Test".to_string(),
                author_email: "test@test.com".to_string(),
                description: "test".to_string(),
                description_first_line: "test".to_string(),
                parents: vec![],
                local_bookmarks: vec![],
                remote_bookmarks: vec![],
                is_working_copy: false,
                conflict: false,
            }],
            merge_source_names: vec![],
        }
    }

    #[test]
    fn test_single_bookmark_per_segment() {
        let segments = vec![segment(vec![bookmark("auth")])];
        let result = resolve_bookmark_selections(&segments, false).unwrap();
        assert_eq!(result.len(), 1);
        assert_eq!(result[0].bookmark.name, "auth");
    }

    #[test]
    fn test_multiple_bookmarks_non_interactive_takes_first() {
        let segments = vec![segment(vec![bookmark("a"), bookmark("b")])];
        let result = resolve_bookmark_selections(&segments, false).unwrap();
        assert_eq!(result[0].bookmark.name, "a");
    }

    #[test]
    fn test_merge_source_names_propagated() {
        let mut seg = segment(vec![bookmark("merge-feat")]);
        seg.merge_source_names = vec!["feat-d".to_string()];
        let segments = vec![seg];
        let result = resolve_bookmark_selections(&segments, false).unwrap();
        assert_eq!(
            result[0].merge_source_names,
            vec!["feat-d"],
            "merge_source_names should propagate from BookmarkSegment to NarrowedSegment"
        );
    }

    #[test]
    fn test_empty_bookmarks_errors() {
        let segments = vec![BookmarkSegment {
            bookmarks: vec![],
            changes: vec![],
            merge_source_names: vec![],
        }];
        assert!(resolve_bookmark_selections(&segments, false).is_err());
    }
}