jj-vine 0.2.0

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

#[cfg(not(feature = "no-e2e-tests"))]
mod e2e {
    use assertables::assert_contains;

    use crate::{error::Result, tests::TestRepo};

    #[tokio::test]
    async fn test_bookmark_and_tracked_mutually_exclusive() -> Result<()> {
        let repo = TestRepo::new();

        let result = repo.try_run(["submit", "some-bookmark", "--tracked"]).await;

        assert_contains!(result.unwrap_err().to_string(), "Usage:");

        Ok(())
    }

    #[tokio::test]
    async fn test_submit_requires_bookmark_or_tracked() -> Result<()> {
        let repo = TestRepo::new();

        let result = repo.try_run(["submit"]).await;

        assert_contains!(result.unwrap_err().to_string(), "Usage:");

        Ok(())
    }

    #[tokio::test]
    async fn test_tracked_with_no_pushed_bookmarks() -> Result<()> {
        let repo = TestRepo::new();

        repo.jj.exec(["new"])?;
        repo.create_change("test.txt", "content", "Test commit")
            .create_bookmark("unpushed-branch");

        let result = repo.try_run(["submit", "--tracked"]).await;

        assert_contains!(result.unwrap_err().to_string(), "No bookmarks in revset");

        Ok(())
    }

    #[tokio::test]
    #[cfg(not(feature = "no-e2e-tests"))]
    async fn test_push_failure_skips_mr_creation() -> Result<()> {
        let repo = TestRepo::with_forgejo_remote();
        let upstream = TestRepo::new();

        upstream
            .create_change("init.txt", "initial", "Initial commit")
            .create_bookmark("main");

        repo.jj.exec([
            "git",
            "remote",
            "set-url",
            "origin",
            &upstream.path.to_string_lossy(),
        ])?;

        repo.jj.exec(["git", "fetch"])?;
        repo.jj.exec(["bookmark", "track", "main"])?;
        repo.jj.exec(["new", "main"])?;
        repo.create_change("test.txt", "content", "Feature commit")
            .create_bookmark("feature-push-fail");

        std::fs::remove_dir_all(&upstream.path)?;

        let result = repo.try_run(["submit", "feature-push-fail"]).await;
        assert_contains!(result.unwrap_err().to_string(), "push");

        Ok(())
    }
}