Implement COB caching
This patch implements caching for COBs by using an SQLite database that is used as a write-thru cache. All reads are replaced with using the cache so as to avoid recomputing the COB graph each time.
52 files changed
+3167
-315
9e745b68
→
9e745b68
modified radicle-cli/examples/rad-inbox.md
@@ -21,7 +21,7 @@ $ rad inbox --sort-by id
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -31,12 +31,12 @@ $ rad inbox --all --sort-by id
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -67,7 +67,7 @@ $ rad inbox list --sort-by id
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -93,7 +93,7 @@ $ rad inbox --all
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/src/commands/clone.rs
@@ -5,9 +5,10 @@ use std::str::FromStr;
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
| - | |
|
|
|
|
|
@@ -186,8 +187,8 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified radicle-cli/src/commands/inbox.rs
@@ -4,10 +4,10 @@ use std::process;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -231,8 +231,8 @@ where
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -384,13 +384,13 @@ fn show(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/src/commands/issue.rs
@@ -1,3 +1,6 @@
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -6,13 +9,14 @@ use anyhow::{anyhow, Context as _};
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -43,6 +47,7 @@ Usage
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -84,6 +89,7 @@ pub enum OperationName {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -141,6 +147,9 @@ pub enum Operation {
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -340,6 +349,7 @@ impl Args for Options {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -396,6 +406,7 @@ impl Args for Options {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -425,7 +436,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -546,12 +557,16 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -562,13 +577,16 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -580,7 +598,8 @@ fn list<R: WriteRepository + cob::Store>(
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -664,16 +683,20 @@ fn list<R: WriteRepository + cob::Store>(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -681,7 +704,7 @@ fn open<R: WriteRepository + cob::Store, G: Signer>(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -696,14 +719,18 @@ fn open<R: WriteRepository + cob::Store, G: Signer>(
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
added radicle-cli/src/commands/issue/cache.rs
@@ -0,0 +1,28 @@
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
modified radicle-cli/src/commands/patch.rs
@@ -2,6 +2,8 @@
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
@@ -34,6 +36,7 @@ use anyhow::anyhow;
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -66,6 +69,7 @@ Usage
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -165,6 +169,7 @@ pub enum OperationName {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -179,27 +184,6 @@ pub struct LabelOptions {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -250,7 +234,7 @@ pub enum Operation {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -263,6 +247,9 @@ pub enum Operation {
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -282,7 +269,8 @@ impl Operation {
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -311,7 +299,7 @@ impl Args for Options {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -487,19 +475,19 @@ impl Args for Options {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -538,6 +526,7 @@ impl Args for Options {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -560,6 +549,7 @@ impl Args for Options {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -635,6 +625,7 @@ impl Args for Options {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -662,12 +653,12 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -694,7 +685,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -742,6 +733,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -801,7 +793,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -809,6 +801,12 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified radicle-cli/src/commands/patch/archive.rs
@@ -1,12 +1,11 @@
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/src/commands/patch/assign.rs
@@ -15,7 +15,7 @@ pub fn run(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
added radicle-cli/src/commands/patch/cache.rs
@@ -0,0 +1,28 @@
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
modified radicle-cli/src/commands/patch/checkout.rs
@@ -4,9 +4,10 @@ use git_ref_format::Qualified;
|
|
|
|
|
|
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -33,10 +34,10 @@ pub fn run(
|
|
|
|
|
|
| + | |
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/src/commands/patch/comment.rs
@@ -3,6 +3,7 @@ use super::*;
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -19,10 +20,15 @@ pub fn run(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified radicle-cli/src/commands/patch/delete.rs
@@ -1,4 +1,3 @@
| - | |
|
|
|
|
|
@@ -6,7 +5,7 @@ use super::*;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/src/commands/patch/diff.rs
@@ -9,8 +9,9 @@ pub fn run(
|
|
|
|
|
|
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/src/commands/patch/edit.rs
@@ -1,6 +1,6 @@
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -15,7 +15,7 @@ pub fn run(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -29,7 +29,7 @@ pub fn run(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -76,7 +76,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/src/commands/patch/label.rs
@@ -12,7 +12,7 @@ pub fn run(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/src/commands/patch/list.rs
@@ -1,7 +1,8 @@
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -15,22 +16,23 @@ use crate::terminal::patch as common;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
|
|
|
|
|
modified radicle-cli/src/commands/patch/ready.rs
@@ -1,6 +1,5 @@
|
|
|
|
| - | |
|
|
|
|
|
@@ -11,7 +10,7 @@ pub fn run(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/src/commands/patch/redact.rs
@@ -13,10 +13,14 @@ pub fn run(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified radicle-cli/src/commands/patch/review.rs
@@ -3,7 +3,7 @@ mod builder;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -61,8 +61,7 @@ pub fn run(
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/src/commands/patch/show.rs
@@ -33,7 +33,7 @@ pub fn run(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/src/commands/patch/update.rs
@@ -12,14 +12,14 @@ pub fn run(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -27,7 +27,7 @@ pub fn run(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/src/commands/stats.rs
@@ -3,11 +3,11 @@ use std::path::Path;
|
|
|
|
|
|
| - | |
| - | |
|
|
| + | |
|
|
|
|
| + | |
|
|
|
|
|
@@ -90,8 +90,8 @@ pub fn run(_options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified radicle-cli/tests/commands.rs
@@ -1456,6 +1456,7 @@ fn test_cob_replication() {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -1463,6 +1464,7 @@ fn test_cob_replication() {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -1505,7 +1507,7 @@ fn test_cob_deletion() {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1526,7 +1528,7 @@ fn test_cob_deletion() {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cob/src/trailers.rs
@@ -61,18 +61,18 @@ impl TryFrom<&OwnedTrailer> for CommitTrailer {
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
| - | |
|
|
|
|
|
modified radicle-httpd/src/api.rs
@@ -9,6 +9,8 @@ use axum::http::Method;
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
@@ -60,8 +62,8 @@ impl Context {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified radicle-httpd/src/api/error.rs
@@ -30,6 +30,14 @@ pub enum Error {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -38,6 +46,10 @@ pub enum Error {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -123,6 +135,7 @@ impl IntoResponse for Error {
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified radicle-httpd/src/api/json.rs
@@ -213,7 +213,7 @@ fn issue_comment(id: &CommentId, comment: &Comment, aliases: &impl AliasStore) -
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -235,7 +235,7 @@ fn patch_comment(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -257,7 +257,7 @@ fn review_comment(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-httpd/src/api/v1/delegates.rs
@@ -5,10 +5,10 @@ use axum::response::IntoResponse;
|
|
|
|
|
|
| - | |
| - | |
|
|
| + | |
|
|
| + | |
|
|
|
|
|
@@ -44,7 +44,6 @@ async fn delegates_projects_handler(
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -73,13 +72,13 @@ async fn delegates_projects_handler(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-httpd/src/api/v1/projects.rs
@@ -14,7 +14,10 @@ use serde::{Deserialize, Serialize};
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -119,13 +122,13 @@ async fn project_root_handler(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -580,9 +583,9 @@ async fn issues_handler(
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -632,7 +635,7 @@ async fn issue_create_handler(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -665,7 +668,7 @@ async fn issue_update_handler(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -716,7 +719,9 @@ async fn issue_handler(
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -749,7 +754,7 @@ async fn patch_create_handler(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -788,7 +793,7 @@ async fn patch_update_handler(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -933,9 +938,9 @@ async fn patches_handler(
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -961,9 +966,8 @@ async fn patch_handler(
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified radicle-httpd/src/test.rs
@@ -11,18 +11,16 @@ use serde_json::Value;
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -231,7 +229,7 @@ fn seed_with_signer<G: Signer>(dir: &Path, profile: radicle::Profile, signer: &G
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -245,7 +243,7 @@ fn seed_with_signer<G: Signer>(dir: &Path, profile: radicle::Profile, signer: &G
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-node/src/runtime.rs
@@ -14,7 +14,6 @@ use reactor::poller::popol;
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -22,6 +21,7 @@ use radicle::node::notifications;
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -42,6 +42,9 @@ pub enum Error {
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -156,6 +159,7 @@ impl Runtime {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -257,6 +261,7 @@ impl Runtime {
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified radicle-node/src/test/environment.rs
@@ -9,6 +9,7 @@ use std::{
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -110,6 +111,7 @@ impl Environment {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -124,6 +126,7 @@ impl Environment {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -380,7 +383,7 @@ impl<G: Signer + cyphernet::Ecdh> NodeHandle<G> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-node/src/tests.rs
@@ -880,7 +880,7 @@ fn test_refs_announcement_offline() {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-node/src/worker.rs
@@ -15,7 +15,7 @@ use radicle::node::notifications;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -179,6 +179,7 @@ struct Worker {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -199,7 +200,13 @@ impl Worker {
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -222,6 +229,7 @@ impl Worker {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -232,7 +240,7 @@ impl Worker {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -282,6 +290,7 @@ impl Worker {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -302,7 +311,7 @@ impl Worker {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -326,6 +335,7 @@ impl Pool {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -343,6 +353,7 @@ impl Pool {
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified radicle-node/src/worker/fetch.rs
@@ -8,8 +8,10 @@ use localtime::LocalTime;
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -62,6 +64,7 @@ impl Handle {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -117,6 +120,8 @@ impl Handle {
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
@@ -189,3 +194,89 @@ fn notify(
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
modified radicle-node/src/worker/fetch/error.rs
@@ -2,7 +2,7 @@ use std::io;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -19,6 +19,32 @@ pub enum Fetch {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified radicle-remote-helper/src/lib.rs
@@ -185,7 +185,7 @@ pub fn run(profile: radicle::Profile) -> Result<(), Error> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-remote-helper/src/list.rs
@@ -1,3 +1,5 @@
| + | |
| + | |
|
|
|
|
|
@@ -17,9 +19,15 @@ pub enum Error {
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -28,6 +36,7 @@ pub enum Error {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -48,7 +57,7 @@ pub fn for_fetch<R: ReadRepository + cob::Store + 'static>(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -74,9 +83,12 @@ pub fn for_push<R: ReadRepository>(profile: &Profile, stored: &R) -> Result<(),
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified radicle-remote-helper/src/push.rs
@@ -1,3 +1,4 @@
| + | |
|
|
|
|
|
@@ -8,8 +9,10 @@ use std::{assert_eq, io};
|
|
|
|
|
|
| + | |
|
|
|
|
| + | |
|
|
|
|
|
@@ -81,6 +84,9 @@ pub enum Error {
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -209,7 +215,16 @@ pub fn run(
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -225,6 +240,7 @@ pub fn run(
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -266,7 +282,16 @@ pub fn run(
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -323,6 +348,10 @@ fn patch_open<G: Signer>(
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -353,7 +382,6 @@ fn patch_open<G: Signer>(
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -442,6 +470,10 @@ fn patch_update<G: Signer>(
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -452,7 +484,6 @@ fn patch_update<G: Signer>(
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -504,6 +535,7 @@ fn push<G: Signer>(
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -524,7 +556,7 @@ fn push<G: Signer>(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -536,7 +568,10 @@ fn patch_merge_all<G: Signer>(
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -547,15 +582,13 @@ fn patch_merge_all<G: Signer>(
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -578,8 +611,8 @@ fn patch_merge_all<G: Signer>(
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified radicle-tools/src/rad-merge.rs
@@ -2,7 +2,7 @@ use std::collections::HashSet;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -15,7 +15,7 @@ fn main() -> anyhow::Result<()> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle/src/cob.rs
@@ -1,4 +1,5 @@
|
|
| + | |
|
|
|
|
|
@@ -18,3 +19,71 @@ pub use radicle_cob::{
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
added radicle/src/cob/cache.rs
@@ -0,0 +1,314 @@
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
added radicle/src/cob/cache/migrations/1.sql
@@ -0,0 +1,19 @@
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
modified radicle/src/cob/issue.rs
@@ -1,3 +1,5 @@
| + | |
| + | |
|
|
|
|
|
@@ -15,8 +17,10 @@ use crate::cob::thread::{Comment, CommentId, Thread};
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -56,6 +60,18 @@ pub enum Error {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -106,7 +122,8 @@ impl State {
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -397,8 +414,8 @@ impl Issue {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -511,13 +528,14 @@ impl<R: ReadRepository> store::Transaction<Issue, R> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -526,9 +544,10 @@ impl<'a, 'g, R> std::fmt::Debug for IssueMut<'a, 'g, R> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| + | |
|
|
|
|
|
@@ -647,13 +666,19 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -673,8 +698,17 @@ impl<'a, R> Deref for Issues<'a, R> {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -705,35 +739,21 @@ impl<'a, R> Issues<'a, R>
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| + | |
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -742,11 +762,52 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -765,11 +826,6 @@ where
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -842,16 +898,16 @@ mod test {
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -937,7 +993,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -976,7 +1032,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -985,7 +1041,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1009,7 +1065,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1035,7 +1091,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1075,7 +1131,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1103,7 +1159,8 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1127,7 +1184,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1153,7 +1210,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1183,7 +1240,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1238,7 +1295,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1276,7 +1333,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1316,7 +1373,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1364,8 +1421,7 @@ mod test {
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -1377,7 +1433,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1393,7 +1449,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1419,7 +1475,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1477,7 +1533,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1521,7 +1577,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1555,7 +1611,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1591,7 +1647,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
added radicle/src/cob/issue/cache.rs
@@ -0,0 +1,685 @@
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
modified radicle/src/cob/patch.rs
@@ -1,4 +1,5 @@
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -7,9 +8,8 @@ use std::str::FromStr;
|
|
|
|
|
|
| - | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -27,6 +27,8 @@ use crate::identity::PayloadError;
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
@@ -124,6 +126,18 @@ pub enum Error {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -359,7 +373,8 @@ impl MergeTarget {
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1289,7 +1304,8 @@ mod lookup {
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1308,6 +1324,10 @@ pub struct Revision {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1431,6 +1451,39 @@ impl fmt::Display for State {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1473,7 +1526,8 @@ impl fmt::Display for Verdict {
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1494,23 +1548,6 @@ pub struct Review {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -1835,19 +1872,26 @@ impl<R: ReadRepository> store::Transaction<Patch, R> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| + | |
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1878,6 +1922,12 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2202,7 +2252,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2211,7 +2261,7 @@ impl<'a, 'g, R> Deref for PatchMut<'a, 'g, R> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2227,6 +2277,17 @@ impl PatchCounts {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2239,6 +2300,15 @@ impl<'a, R> Deref for Patches<'a, R> {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2270,23 +2340,27 @@ where
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2320,10 +2394,10 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2331,8 +2405,13 @@ where
|
|
|
|
|
|
| + | |
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2341,12 +2420,13 @@ where
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2354,8 +2434,12 @@ where
|
|
|
|
|
|
| + | |
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2364,12 +2448,17 @@ where
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2379,11 +2468,12 @@ where
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2392,8 +2482,12 @@ where
|
|
|
|
|
|
| + | |
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2404,8 +2498,135 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2423,6 +2644,7 @@ mod test {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -2440,11 +2662,53 @@ mod test {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2477,7 +2741,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2486,7 +2750,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2519,7 +2783,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2550,7 +2814,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2602,7 +2866,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2790,7 +3054,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2833,7 +3097,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2880,7 +3144,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2914,7 +3178,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2963,7 +3227,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
added radicle/src/cob/patch/cache.rs
@@ -0,0 +1,975 @@
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
modified radicle/src/cob/store.rs
@@ -5,6 +5,7 @@ use std::fmt::Debug;
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -112,7 +113,10 @@ impl<'a, T, R> AsRef<R> for Store<'a, T, R> {
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -234,7 +238,9 @@ where
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -271,7 +277,10 @@ impl<T: Cob + cob::Evaluate<R>, R> Default for Transaction<T, R> {
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -324,9 +333,13 @@ impl<T: Cob + cob::Evaluate<R>, R> Transaction<T, R> {
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle/src/cob/thread.rs
@@ -1,6 +1,5 @@
|
|
|
|
| - | |
|
|
|
|
|
@@ -54,7 +53,8 @@ pub type CommentId = EntryId;
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -83,22 +83,29 @@ impl Edit {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -106,11 +113,8 @@ impl<T: Serialize> Serialize for Comment<T> {
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -211,7 +215,7 @@ impl<L> Comment<L> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -277,7 +281,8 @@ impl From<Action> for nonempty::NonEmpty<Action> {
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
modified radicle/src/profile.rs
@@ -27,7 +27,8 @@ use crate::prelude::Did;
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -104,6 +105,10 @@ pub enum Error {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -418,7 +423,7 @@ impl Home {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -447,6 +452,10 @@ impl Home {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -486,6 +495,62 @@ impl Home {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified radicle/src/storage.rs
@@ -404,6 +404,17 @@ pub trait WriteStorage: ReadStorage {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified radicle/src/test/storage.rs
@@ -1,4 +1,5 @@
|
|
| + | |
|
|
|
|
|
@@ -313,3 +314,87 @@ impl SignRepository for MockRepository {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |