Radish alpha
r
Radicle desktop app
Radicle
Git (anonymous pull)
Log in to clone via SSH
Remove migrate argument since not used anymore
Sebastian Martinez committed 1 year ago
commit a2776c27a4eff361cc0fbd412ce1934b9b2d3ef2
parent 52c25a905d8edbbe98523c1e80e9edfbd2ce7030
6 files changed +20 -25
modified Cargo.lock
@@ -3748,7 +3748,7 @@ dependencies = [
[[package]]
name = "radicle"
version = "0.13.0"
-
source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git#2d13591ec21e6ce04678e2965f08d145cf2d76ae"
+
source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git#47b200988c311d6f06bba7244efa829e9d79b637"
dependencies = [
 "amplify",
 "base64 0.21.7",
@@ -3778,7 +3778,7 @@ dependencies = [
[[package]]
name = "radicle-cob"
version = "0.12.0"
-
source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git#2d13591ec21e6ce04678e2965f08d145cf2d76ae"
+
source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git#47b200988c311d6f06bba7244efa829e9d79b637"
dependencies = [
 "fastrand",
 "git2",
@@ -3796,7 +3796,7 @@ dependencies = [
[[package]]
name = "radicle-crypto"
version = "0.11.0"
-
source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git#2d13591ec21e6ce04678e2965f08d145cf2d76ae"
+
source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git#47b200988c311d6f06bba7244efa829e9d79b637"
dependencies = [
 "amplify",
 "cyphernet",
@@ -3814,7 +3814,7 @@ dependencies = [
[[package]]
name = "radicle-dag"
version = "0.9.0"
-
source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git#2d13591ec21e6ce04678e2965f08d145cf2d76ae"
+
source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git#47b200988c311d6f06bba7244efa829e9d79b637"
dependencies = [
 "fastrand",
]
@@ -3836,7 +3836,7 @@ dependencies = [
[[package]]
name = "radicle-ssh"
version = "0.9.0"
-
source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git#2d13591ec21e6ce04678e2965f08d145cf2d76ae"
+
source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git#47b200988c311d6f06bba7244efa829e9d79b637"
dependencies = [
 "byteorder",
 "log",
modified crates/radicle-types/src/traits/cobs.rs
@@ -1,4 +1,3 @@
-
use radicle::cob::migrate;
use radicle::cob::object::Storage;
use radicle::storage::refs::draft;
use radicle::storage::{self, ReadStorage};
@@ -59,7 +58,7 @@ pub trait Cobs: Profile {
            &draft_oid.into(),
        )?;

-
        let mut patches = profile.patches_mut(&repo, migrate::ignore)?;
+
        let mut patches = profile.patches_mut(&repo)?;
        patches.write(&cob_id.into())?;

        storage::git::cob::DraftStore::new(&repo, *signer.public_key()).remove(
modified crates/radicle-types/src/traits/issue.rs
@@ -1,4 +1,3 @@
-
use radicle::cob::migrate;
use radicle::issue::cache::Issues as _;
use radicle::node::Handle;
use radicle::storage::ReadStorage;
@@ -17,7 +16,7 @@ pub trait Issues: Profile {
        let profile = self.profile();
        let repo = profile.storage.repository(rid)?;
        let status = status.unwrap_or_default();
-
        let issues = profile.issues(&repo, migrate::ignore)?;
+
        let issues = profile.issues(&repo)?;
        let mut issues: Vec<_> = issues
            .list()?
            .filter_map(|r| {
@@ -43,7 +42,7 @@ pub trait Issues: Profile {
    ) -> Result<Option<cobs::issue::Issue>, Error> {
        let profile = self.profile();
        let repo = profile.storage.repository(rid)?;
-
        let issues = profile.issues(&repo, migrate::ignore)?;
+
        let issues = profile.issues(&repo)?;
        let issue = issues.get(&id.into())?;

        let aliases = &profile.aliases();
@@ -59,7 +58,7 @@ pub trait Issues: Profile {
    ) -> Result<Option<Vec<cobs::thread::Thread>>, Error> {
        let profile = self.profile();
        let repo = profile.storage.repository(rid)?;
-
        let issues = profile.issues(&repo, migrate::ignore)?;
+
        let issues = profile.issues(&repo)?;
        let issue = issues.get(&id.into())?;

        let aliases = &profile.aliases();
@@ -104,7 +103,7 @@ pub trait IssuesMut: Profile {
        let repo = profile.storage.repository(rid)?;
        let signer = profile.signer()?;
        let aliases = profile.aliases();
-
        let mut issues = profile.issues_mut(&repo, migrate::ignore)?;
+
        let mut issues = profile.issues_mut(&repo)?;
        let issue = issues.create(
            new.title,
            new.description,
@@ -133,7 +132,7 @@ pub trait IssuesMut: Profile {
        let repo = profile.storage.repository(rid)?;
        let signer = profile.signer()?;
        let aliases = profile.aliases();
-
        let mut issues = profile.issues_mut(&repo, migrate::ignore)?;
+
        let mut issues = profile.issues_mut(&repo)?;
        let mut issue = issues.get_mut(&cob_id.into())?;

        match action {
modified crates/radicle-types/src/traits/patch.rs
@@ -1,4 +1,3 @@
-
use radicle::cob::migrate;
use radicle::node::Handle;
use radicle::patch::cache::Patches as _;
use radicle::storage;
@@ -22,7 +21,7 @@ pub trait Patches: Profile {
        let take = take.unwrap_or(20);
        let repo = profile.storage.repository(rid)?;
        let aliases = &profile.aliases();
-
        let cache = profile.patches(&repo, migrate::ignore)?;
+
        let cache = profile.patches(&repo)?;
        let patches = match status {
            None => cache.list()?.collect::<Vec<_>>(),
            Some(s) => cache.list_by_status(&s.into())?.collect::<Vec<_>>(),
@@ -55,7 +54,7 @@ pub trait Patches: Profile {
    ) -> Result<Option<cobs::patch::Patch>, Error> {
        let profile = self.profile();
        let repo = profile.storage.repository(rid)?;
-
        let patches = profile.patches(&repo, migrate::ignore)?;
+
        let patches = profile.patches(&repo)?;
        let patch = patches.get(&id.into())?;
        let aliases = &profile.aliases();
        let patches = patch.map(|patch| cobs::patch::Patch::new(id.into(), &patch, aliases));
@@ -70,7 +69,7 @@ pub trait Patches: Profile {
    ) -> Result<Option<Vec<cobs::patch::Revision>>, Error> {
        let profile = self.profile();
        let repo = profile.storage.repository(rid)?;
-
        let patches = profile.patches(&repo, migrate::ignore)?;
+
        let patches = profile.patches(&repo)?;
        let revisions = patches.get(&id.into())?.map(|patch| {
            let aliases = &profile.aliases();

@@ -91,7 +90,7 @@ pub trait Patches: Profile {
    ) -> Result<Option<cobs::patch::Revision>, Error> {
        let profile = self.profile();
        let repo = profile.storage.repository(rid)?;
-
        let patches = profile.patches(&repo, migrate::ignore)?;
+
        let patches = profile.patches(&repo)?;
        let revision = patches.get(&id.into())?.and_then(|patch| {
            let aliases = &profile.aliases();

@@ -117,7 +116,7 @@ pub trait PatchesMut: Profile {
        let repo = profile.storage.repository(rid)?;
        let signer = profile.signer()?;
        let aliases = profile.aliases();
-
        let mut patches = profile.patches_mut(&repo, migrate::ignore)?;
+
        let mut patches = profile.patches_mut(&repo)?;
        let mut patch = patches.get_mut(&cob_id.into())?;

        match action {
modified crates/radicle-types/src/traits/repo.rs
@@ -1,4 +1,3 @@
-
use radicle::cob::migrate;
use radicle_surf as surf;
use serde::{Deserialize, Serialize};

@@ -104,9 +103,9 @@ pub trait Repo: Profile {
            .and_then(|payload| {
                let (_, head) = repo.head().ok()?;
                let commit = repo.commit(head).ok()?;
-
                let patches = profile.patches(repo, migrate::ignore).ok()?;
+
                let patches = profile.patches(repo).ok()?;
                let patches = patches.counts().ok()?;
-
                let issues = profile.issues(repo, migrate::ignore).ok()?;
+
                let issues = profile.issues(repo).ok()?;
                let issues = issues.counts().ok()?;

                let data: repo::ProjectPayloadData = (*payload).clone().try_into().ok()?;
modified crates/radicle-types/src/traits/thread.rs
@@ -2,7 +2,6 @@ use base64::{engine::general_purpose::STANDARD, Engine as _};
use localtime::LocalTime;

use radicle::cob;
-
use radicle::cob::cache::migrate;
use radicle::git;
use radicle::identity;
use radicle::node::Handle;
@@ -47,7 +46,7 @@ pub trait Thread: Profile {
        let mut node = Node::new(profile.socket());
        let signer = profile.signer()?;
        let repo = profile.storage.repository(rid)?;
-
        let mut issues = profile.issues_mut(&repo, migrate::ignore)?;
+
        let mut issues = profile.issues_mut(&repo)?;
        let mut issue = issues.get_mut(&new.id.into())?;
        let id = new.reply_to.unwrap_or_else(|| {
            let (root_id, _) = issue.root();
@@ -90,7 +89,7 @@ pub trait Thread: Profile {
        let mut node = Node::new(profile.socket());
        let signer = profile.signer()?;
        let repo = profile.storage.repository(rid)?;
-
        let mut patches = profile.patches_mut(&repo, migrate::ignore)?;
+
        let mut patches = profile.patches_mut(&repo)?;
        let mut patch = patches.get_mut(&new.id.into())?;
        let n = new.clone();
        let oid = patch.comment(