Radish alpha
h
heartwood
Radicle Heartwood Protocol & Stack
Radicle
Git (anonymous pull)
Log in to clone via SSH
Commits ›
radicle: Detect current repository using `jj`
✗ CI failure Lorenz Leutgeb committed 7 months ago
commit d33698091264f0fc164e042bf78e7c2d7536804b
parent 89e2a2b13958752a6a291970d75a3ce62a52d6b4
1 failed 1 pending (2 total) View logs
3 files changed +89 -2
added crates/radicle-cli/examples/jj-init-bare.md
@@ -0,0 +1,19 @@
+ 
We initialize Jujutusu for our repository for use with a bare Git repo.
+
+ 
```(stderr)
+ 
$ jj git init --git-repo heartwood heartwood.jj
+ 
Done importing changes from the underlying Git repo.
+ 
Working copy  (@) now at: lvxkkpmk 9ec513df (empty) (no description set)
+ 
Parent commit (@-)      : xpnzuzwn f2de534b master | Second commit
+ 
Added 1 files, modified 0 files, removed 0 files
+ 
Initialized repo in "heartwood.jj"
+ 
```
+
+ 
```
+ 
$ cd heartwood.jj
+ 
```
+
+ 
```
+ 
$ rad .
+ 
rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+ 
```
 

\ No newline at end of file
modified crates/radicle-cli/tests/commands.rs
@@ -845,6 +845,37 @@ fn rad_patch() {
}



#[test]
+ 
fn rad_jj_bare() {
+ 
    // We test whether `jj` is installed, and have this test succeed if it is not.
+ 
    // Programmatic skipping of tests is not supported as of 2024-08.
+ 
    if !program_reports_version("jj") {
+ 
        return;
+ 
    }
+
+ 
    let mut environment = Environment::new();
+ 
    let mut profile = environment.node("alice");
+ 
    let rid = profile.project("heartwood", "Radicle Heartwood Protocol & Stack");
+
+ 
    test(
+ 
        "examples/rad-init-existing-bare.md",
+ 
        environment.work(&profile),
+ 
        Some(&profile.home),
+ 
        [(
+ 
            "URL",
+ 
            git::url::File::new(profile.storage.path())
+ 
                .rid(rid)
+ 
                .to_string()
+ 
                .as_str(),
+ 
        )],
+ 
    )
+ 
    .unwrap();
+
+ 
    environment
+ 
        .tests(["jj-config", "jj-init-bare"], &profile)
+ 
        .unwrap();
+ 
}
+
+ 
#[test]

fn rad_jj_colocated_patch() {

    // We test whether `jj` is installed, and have this test succeed if it is not.

    // Programmatic skipping of tests is not supported as of 2024-08.
modified crates/radicle/src/rad.rs
@@ -372,6 +372,15 @@ pub fn remove_remote(repo: &git2::Repository) -> Result<(), RemoteError> {
    Ok(())

}
+ 
#[derive(Error, Debug)]
+ 
pub enum CwdError {
+ 
    #[error(transparent)]
+ 
    Remote(#[from] RemoteError),
+
+ 
    #[error(transparent)]
+ 
    Jujutsu(#[from] JujutsuGitRootError),
+ 
}
+ 


/// Get the RID of the repository in current working directory

///

/// It will atempt to search parent directories if `path` did not find
@@ -382,8 +391,8 @@ pub fn remove_remote(repo: &git2::Repository) -> Result<(), RemoteError> {
/// This function should only perform read operations since we do not

/// want to modify the wrong repository in the case that it found a

/// Git repository that is not a Radicle repository.
- 
pub fn cwd() -> Result<(git2::Repository, RepoId), RemoteError> {
- 
    let repo = repo()?;
+ 
pub fn cwd() -> Result<(git2::Repository, RepoId), CwdError> {
+ 
    let repo = repo().or_else(|_| jj_git_root())?;

    let (_, id) = remote(&repo)?;



    Ok((repo, id))
@@ -411,6 +420,34 @@ pub fn repo() -> Result<git2::Repository, git2::Error> {
    Ok(repo)

}
+ 
#[derive(Error, Debug)]
+ 
pub enum JujutsuGitRootError {
+ 
    #[error("git: {0}")]
+ 
    Git(#[from] git2::Error),
+
+ 
    #[error("i/o: {0}")]
+ 
    Io(#[from] io::Error),
+
+ 
    #[error("jj exited with status {status}")]
+ 
    CommandFailure { status: std::process::ExitStatus },
+ 
}
+
+ 
/// Get the Git repo backing the current Jujutsu repository, if possible.
+ 
pub fn jj_git_root() -> Result<git2::Repository, JujutsuGitRootError> {
+ 
    let output = std::process::Command::new("jj")
+ 
        .args(["git", "root"])
+ 
        .output()?;
+
+ 
    if !output.status.success() {
+ 
        return Err(JujutsuGitRootError::CommandFailure {
+ 
            status: output.status,
+ 
        });
+ 
    }
+
+ 
    let path = std::path::PathBuf::from(String::from_utf8_lossy(&output.stdout).to_string().trim());
+ 
    Ok(git2::Repository::open(path)?)
+ 
}
+ 


/// Setup patch upstream branch such that `git push` updates the patch.

pub fn setup_patch_upstream<'a>(

    patch: &ObjectId,