jj-vine 0.3.2

Stacked pull requests for jj (jujutsu). Supports GitLab and bookmark-based flow.
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
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
use std::cmp::Ordering;

use clap::{Args, ValueEnum};
use enum_dispatch::enum_dispatch;
use futures::{
    StreamExt,
    stream::{FuturesOrdered, FuturesUnordered},
    try_join,
};
use itertools::Itertools;
use jiff::SpanRound;
use owo_colors::OwoColorize;
use pluralizer::pluralize;
use tracing::info;

use crate::{
    bookmark::Bookmark,
    cli::CliConfig,
    commands::{GetBookmarksOptions, StrVisualWidth},
    config::Config,
    description::FormatMergeRequest,
    error::{ConfigSnafu, Error, InvalidComponentSnafu, Result},
    forge::{
        ApprovalSatisfaction,
        CheckStatus,
        Forge,
        ForgeImpl,
        ForgeMergeRequest,
        MergeRequestStatus,
    },
    jj::Jujutsu,
    output::Output,
};

#[derive(Args)]
pub struct StatusCommandConfig {
    /// Output mode
    /// - two-line-compact: Two-lines per merge request
    #[arg(short = 'o', long = "output", default_value = "two-line-compact")]
    pub output_mode: DisplayStatusMode,

    /// Options for the revset
    #[command(flatten)]
    pub revset_options: StatusCommandRevsetOptions,
}

impl StatusCommandConfig {
    pub fn help_long() -> String {
        format!(
            r#"
Show the status of tracked bookmarks and their {}

{}

Show the status of all my bookmarks:
{}

Show the status of all tracked bookmarks:
{}

Show the status of a specific revset:
{}
"#,
            match ForgeImpl::from_cwd() {
                Ok(forge) => format!("{}s", forge.mr_name()),
                Err(_) => "MRs/PRs".to_string(),
            },
            "Examples:".yellow().bold(),
            "jj vine status".green().bold(),
            "jj vine status --tracked".green().bold(),
            "jj vine status -r <revset>".green().bold(),
        )
    }
}

#[derive(Args, Default)]
#[group(required = false, multiple = false)]
pub struct StatusCommandRevsetOptions {
    /// Use a manual revset
    #[arg(short = 'r', long)]
    pub revset: Option<String>,

    /// Include only `(mine() & tracked_remote_bookmarks()) ~ trunk()`
    #[arg(long)]
    pub tracked: bool,
}

impl StatusCommandRevsetOptions {
    fn to_get_bookmarks_options(&self) -> GetBookmarksOptions {
        match (self.revset.as_deref(), self.tracked) {
            (Some(revset), false) => GetBookmarksOptions::Revset(revset.to_string()),
            (None, true) => GetBookmarksOptions::Tracked,
            (None, false) => GetBookmarksOptions::Mine,
            _ => unreachable!(),
        }
    }
}

enum BookmarkStatus {
    HasMergeRequest {
        bookmark: String,
        merge_request: Box<ForgeMergeRequest>,
        status: MergeRequestStatus,
    },
    NoMergeRequest {
        bookmark: String,
    },
}

struct BookmarkStatusError {
    bookmark: String,
    error: Error,
}

pub async fn status(config: &StatusCommandConfig, cli_config: &CliConfig<'_>) -> Result<()> {
    let jj = Jujutsu::new(&cli_config.repository)?;
    let repo_config = Config::load(&cli_config.repository)?;
    let forge = ForgeImpl::new(&repo_config)?;
    let output = cli_config.output;

    let revset = config.revset_options.to_get_bookmarks_options().to_revset();
    let changes = jj.log(revset)?;
    let bookmarks: Vec<_> = Bookmark::from_changes(&changes).into_iter().collect();

    if bookmarks.is_empty() {
        output.finish();
        info!("No tracked bookmarks found.");
        return Ok(());
    }

    output.log_current("Checking status of tracked bookmarks");

    let futures = FuturesUnordered::new();

    for bookmark in &bookmarks {
        futures.push(async {
            let _substep = output.start_substep(bookmark.name().to_string());

            let mr_option = forge
                .find_merge_request_by_source_branch(bookmark.name())
                .await
                .map_err(|e| BookmarkStatusError {
                    bookmark: bookmark.name().to_string(),
                    error: e,
                })?;

            let status = match mr_option {
                Some(mr) => {
                    let mr_status = forge
                        .get_merge_request_status(mr.iid().as_ref())
                        .await
                        .map_err(|e| BookmarkStatusError {
                            bookmark: bookmark.name().to_string(),
                            error: e,
                        })?;
                    BookmarkStatus::HasMergeRequest {
                        bookmark: bookmark.name().to_string(),
                        merge_request: Box::new(mr),
                        status: mr_status,
                    }
                }
                None => BookmarkStatus::NoMergeRequest {
                    bookmark: bookmark.name().to_string(),
                },
            };

            Ok(status)
        });
    }

    let statuses = futures.collect::<Vec<_>>().await;

    let rendered = config.output_mode.render(statuses, &forge, output).await;

    output.finish();

    info!("{}", rendered);

    Ok(())
}

#[derive(ValueEnum, Clone, Copy)]
pub enum DisplayStatusMode {
    /// Render the status of merge requests in a two-line compact format.
    #[value(id = "two-line-compact")]
    TwoLineCompact,
}

impl std::str::FromStr for DisplayStatusMode {
    type Err = Error;

    fn from_str(s: &str) -> Result<Self> {
        match s {
            "flat" => Ok(DisplayStatusMode::TwoLineCompact),
            _ => Err(ConfigSnafu {
                message: format!("Invalid output mode: {}. Valid modes are: flat", s),
            }
            .build()),
        }
    }
}

impl DisplayStatusMode {
    async fn render(
        &self,
        statuses: Vec<Result<BookmarkStatus, BookmarkStatusError>>,
        forge: &ForgeImpl,
        output: &dyn Output,
    ) -> String {
        match self {
            DisplayStatusMode::TwoLineCompact => {
                print_two_line_compact(statuses, forge, output).await
            }
        }
    }
}

fn sorted_statuses(
    statuses: &[Result<BookmarkStatus, BookmarkStatusError>],
) -> impl Iterator<Item = &Result<BookmarkStatus, BookmarkStatusError>> + '_ {
    statuses.iter().sorted_by(|a, b| match (a, b) {
        // Order by merge request ID first
        (
            Ok(BookmarkStatus::HasMergeRequest {
                merge_request: a, ..
            }),
            Ok(BookmarkStatus::HasMergeRequest {
                merge_request: b, ..
            }),
        ) => a.iid().cmp(&b.iid()),

        // Place merge requests before no merge requests
        (Ok(BookmarkStatus::HasMergeRequest { .. }), _) => Ordering::Less,
        (_, Ok(BookmarkStatus::HasMergeRequest { .. })) => Ordering::Greater,

        // Order no merge requests by bookmark name
        (
            Ok(BookmarkStatus::NoMergeRequest { bookmark: a }),
            Ok(BookmarkStatus::NoMergeRequest { bookmark: b }),
        ) => a.cmp(b),

        // Place errors last
        (Ok(BookmarkStatus::NoMergeRequest { .. }), _) => Ordering::Less,
        (_, Ok(BookmarkStatus::NoMergeRequest { .. })) => Ordering::Greater,
        (Err(_), Err(_)) => Ordering::Equal,
    })
}

/// Renders the status of merge requests in a two-line compact format.
/// Example:
/// !123 MR Title Here
///      my-bookmark • [READY] • ✓ Checks OK • Approved (3/3)
async fn print_two_line_compact(
    statuses: Vec<Result<BookmarkStatus, BookmarkStatusError>>,
    forge: &ForgeImpl,
    output: &dyn Output,
) -> String {
    let futures: FuturesOrdered<_> = sorted_statuses(&statuses)
        .map(|status| two_line_compact_status(status, forge, output))
        .collect();

    futures
        .collect::<Vec<_>>()
        .await
        .into_iter()
        .flatten()
        .join("\n\n")
}

async fn two_line_compact_status(
    status: &Result<BookmarkStatus, BookmarkStatusError>,
    forge: &ForgeImpl,
    output: &dyn Output,
) -> Option<String> {
    match status {
        Ok(BookmarkStatus::HasMergeRequest {
            bookmark,
            merge_request,
            status,
        }) => {
            let _substep =
                output.start_substep(forge.format_merge_request_id(&merge_request.iid()));

            let data = StatusData::new(
                forge,
                bookmark.clone(),
                merge_request.clone(),
                status.clone(),
            );

            // TODO would love templating language like jj has
            let first_line = match parse_components("iid title") {
                Ok(line) => line,
                Err(e) => return Some(e.to_string()),
            };
            let second_line = match parse_components(
                "bookmark ready checks approval num_discussions created url",
            ) {
                Ok(line) => line,
                Err(e) => return Some(e.to_string()),
            };

            let (first_line, second_line) = match try_join!(
                render_components(first_line, &data),
                render_components(second_line, &data)
            ) {
                Ok(lines) => lines,
                Err(err) => return Some(err.to_string()),
            };

            let second_line_padding =
                " ".repeat(first_line.first().unwrap_or(&"".to_string()).visual_width() + 1);

            Some(format!(
                "{}\n{}{}",
                first_line.join(" "),
                second_line_padding,
                second_line.join(&"".dimmed().to_string()),
            ))
        }
        Ok(BookmarkStatus::NoMergeRequest { bookmark }) => Some(format!(
            "{} {}",
            bookmark.magenta(),
            "No merge request".dimmed()
        )),
        Err(BookmarkStatusError { bookmark, error }) => Some(format!(
            "Failed to get status for bookmark {}: {}",
            bookmark.magenta(),
            error
        )),
    }
}

fn parse_components(line: &str) -> Result<Vec<StatusComponentImpl>> {
    line.split_whitespace()
        .map(get_component)
        .collect::<Result<Vec<_>>>()
}

async fn render_components(
    components: Vec<StatusComponentImpl>,
    data: &StatusData<'_>,
) -> Result<Vec<String>> {
    let futures: FuturesOrdered<_> = components
        .iter()
        .map(|component| component.render(data))
        .collect();

    Ok(futures
        .collect::<Vec<_>>()
        .await
        .into_iter()
        .collect::<Result<Vec<_>>>()?
        .into_iter()
        .flatten()
        .collect())
}

fn get_component(name: &str) -> Result<StatusComponentImpl> {
    match name {
        "bookmark" => Ok(BookmarkNameComponent {}.into()),
        "iid" => Ok(MergeRequestIIDComponent {}.into()),
        "title" => Ok(MergeRequestTitleComponent {}.into()),
        "ready" => Ok(ReadyToMergeComponent {}.into()),
        "checks" => Ok(ChecksStatusComponent {}.into()),
        "approval" => Ok(ApprovalStatusComponent {}.into()),
        "created" => Ok(CreatedAtComponent {}.into()),
        "url" => Ok(MergeRequestURLComponent {}.into()),
        "num_discussions" => Ok(NumOpenDiscussionsComponent {}.into()),
        _ => Err(InvalidComponentSnafu {
            component: name.to_string(),
        }
        .build()),
    }
}

#[enum_dispatch]
trait StatusComponent: Send + Sync {
    async fn render(&self, status: &StatusData<'_>) -> Result<Option<String>>;
}

#[enum_dispatch(StatusComponent)]
enum StatusComponentImpl {
    BookmarkName(BookmarkNameComponent),
    MergeRequestIID(MergeRequestIIDComponent),
    MergeRequestTitle(MergeRequestTitleComponent),
    ReadyToMerge(ReadyToMergeComponent),
    ChecksStatus(ChecksStatusComponent),
    ApprovalStatus(ApprovalStatusComponent),
    CreatedAt(CreatedAtComponent),
    MergeRequestURL(MergeRequestURLComponent),
    NumOpenDiscussions(NumOpenDiscussionsComponent),
}

macro_rules! component {
    ($struct_name:ident, $body:expr) => {
        struct $struct_name {}

        impl StatusComponent for $struct_name {
            async fn render(&self, status: &StatusData<'_>) -> Result<Option<String>> {
                ($body)(status).await
            }
        }
    };
}

struct StatusData<'a> {
    forge: &'a ForgeImpl,
    bookmark: String,
    merge_request: Box<ForgeMergeRequest>,
    status: MergeRequestStatus,
}

impl<'a> StatusData<'a> {
    fn new(
        forge: &'a ForgeImpl,
        bookmark: String,
        merge_request: Box<ForgeMergeRequest>,
        status: MergeRequestStatus,
    ) -> Self {
        Self {
            forge,
            bookmark,
            merge_request,
            status,
        }
    }
}

component!(BookmarkNameComponent, async |data: &StatusData<'_>| {
    Ok(Some(data.bookmark.magenta().to_string()))
});

component!(MergeRequestIIDComponent, async |data: &StatusData<'_>| {
    Ok(Some(
        data.forge
            .format_merge_request_id(&data.merge_request.iid())
            .cyan()
            .to_string(),
    ))
});

component!(MergeRequestTitleComponent, async |data: &StatusData<'_>| {
    Ok(Some(format!("\"{}\"", data.merge_request.title().white())))
});

component!(ReadyToMergeComponent, async |data: &StatusData<'_>| {
    if data.status.ready_to_merge() {
        Ok(Some("[READY]".green().bold().to_string()))
    } else {
        Ok(None)
    }
});

component!(ChecksStatusComponent, async |data: &StatusData<'_>| {
    match data.status.check_status {
        CheckStatus::Success => Ok(Some("✓ Checks OK".green().to_string())),
        CheckStatus::Failed => Ok(Some("✗ Checks failing".red().to_string())),
        CheckStatus::Pending => Ok(Some("⋯ Checks pending".yellow().to_string())),
        CheckStatus::None => Ok(None),
    }
});

component!(ApprovalStatusComponent, async |data: &StatusData<'_>| {
    let approval_status = &data.status.approval_status;
    if approval_status.required_count == 0
        && approval_status.satisfaction == ApprovalSatisfaction::Satisfied
    {
        Ok(Some(
            pluralize("approval", approval_status.approved_count as isize, true)
                .white()
                .to_string(),
        ))
    } else if approval_status.satisfaction == ApprovalSatisfaction::Satisfied {
        Ok(Some(
            format!(
                "Approved ({}/{})",
                approval_status.approved_count, approval_status.required_count
            )
            .green()
            .to_string(),
        ))
    } else if approval_status.satisfaction != ApprovalSatisfaction::Unknown {
        Ok(Some(
            format!(
                "Needs {} ({}/{})",
                pluralize("approval", approval_status.required_count as isize, false),
                approval_status.approved_count,
                approval_status.required_count
            )
            .red()
            .to_string(),
        ))
    } else {
        Ok(None)
    }
});

component!(CreatedAtComponent, async |data: &StatusData<'_>| {
    let now = jiff::Zoned::now();
    let duration = (data.merge_request.created_at() - now.timestamp()).abs();

    let mut round = SpanRound::new().largest(jiff::Unit::Year).relative(&now);

    if duration.total((jiff::Unit::Hour, &now)).unwrap() > 24.0 {
        round = round.smallest(jiff::Unit::Hour);
    } else if duration.total((jiff::Unit::Minute, &now)).unwrap() > 0.0 {
        round = round.smallest(jiff::Unit::Minute);
    } else {
        round = round.smallest(jiff::Unit::Second);
    }

    Ok(Some(
        format!(
            "{:#} old",
            duration.round(round).expect("Failed to round duration")
        )
        .dimmed()
        .to_string(),
    ))
});

component!(MergeRequestURLComponent, async |data: &StatusData<'_>| {
    Ok(Some(
        data.merge_request
            .url(data.forge)
            .truecolor(100, 100, 100)
            .to_string(),
    ))
});

component!(NumOpenDiscussionsComponent, async |data: &StatusData<
    '_,
>|
       -> Result<
    Option<String>,
> {
    let num_open_discussions = data
        .forge
        .num_open_discussions(&data.merge_request.iid())
        .await?;

    match num_open_discussions.unresolved {
        0 => Ok(None),
        unresolved => Ok(Some(
            format!(
                "{} open {}",
                unresolved,
                pluralize("discussion", unresolved as isize, false)
            )
            .yellow()
            .to_string(),
        )),
    }
});