modified radicle-cli/examples/rad-merge-via-push.md
@@ -4,7 +4,7 @@ Let's start by creating two patches.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -12,7 +12,7 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -22,8 +22,8 @@ This creates some remote tracking branches for us:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -35,13 +35,13 @@ $ rad inspect --refs
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -60,8 +60,8 @@ When we push to `rad/master`, we automatically merge the patches:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -70,8 +70,8 @@ $ rad patch --merged
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -91,8 +91,8 @@ $ rad inspect --refs
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-patch-draft.md
@@ -9,16 +9,16 @@ To open a patch in draft mode, we use the `--draft` option:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -34,14 +34,14 @@ $ rad patch show 6d7793b859860db775fd8ff1d18ffb6de2b9ca0e
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -58,11 +58,11 @@ If for whatever reason, it needed to go back into draft mode, we could use
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-patch-via-push.md
@@ -8,7 +8,7 @@ $ git checkout -b feature/1
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -16,10 +16,10 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -37,7 +37,7 @@ branch associated with this patch:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -45,7 +45,7 @@ Let's check that it's up to date with our local head:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -57,13 +57,13 @@ $ git show-ref
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -73,7 +73,7 @@ simpler:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -82,8 +82,8 @@ We see both branches with upstreams now:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -94,8 +94,8 @@ $ rad patch
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -114,9 +114,9 @@ $ git commit -a -m "Improve code" -q --allow-empty
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -134,10 +134,10 @@ This allows for pushing to the remote patch branch without using the full
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -149,7 +149,7 @@ $ rad patch show 8678aaf
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -162,14 +162,14 @@ $ git rev-parse HEAD
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -190,7 +190,7 @@ Now let's push to the patch head.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -203,18 +203,18 @@ use `--force` to force the update.
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -226,7 +226,7 @@ $ rad patch show 8678aaf
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
modified radicle-cli/examples/rad-patch.md
@@ -31,7 +31,7 @@ master <- z6MknSL…StBU8Vi/flux-capacitor-power (3e674d1)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -44,14 +44,14 @@ $ rad patch
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -93,45 +93,45 @@ $ git commit --message "Add README, just for the fun"
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -141,7 +141,7 @@ $ rad patch show de3096d
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -149,14 +149,14 @@ $ rad patch show de3096d
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -166,7 +166,7 @@ $ rad patch show de3096d
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/workflow/4-patching-contributor.md
@@ -31,7 +31,7 @@ master <- z6Mkt67…v4N1tRk/flux-capacitor-power (3e674d1)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -44,12 +44,12 @@ $ rad patch
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -80,15 +80,15 @@ $ git commit --message "Add README, just for the fun"
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
modified radicle-cli/examples/workflow/5-patching-maintainer.md
@@ -32,10 +32,10 @@ $ git branch -r
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -47,7 +47,7 @@ $ rad patch show 5f0a547
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -64,10 +64,10 @@ $ git commit --fixup HEAD~
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -89,10 +89,10 @@ $ git push rad master
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -106,8 +106,8 @@ $ rad patch show 5f0a547
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified radicle-cli/src/commands/patch/edit.rs
@@ -21,11 +21,34 @@ pub fn run(
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified radicle-cob/src/history/entry.rs
@@ -9,8 +9,8 @@ use nonempty::NonEmpty;
|
|
|
|
|
|
| - | |
|
|
| + | |
|
|
|
|
|
@@ -66,6 +66,12 @@ impl From<&EntryId> for object::ObjectId {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified radicle-httpd/src/api/json.rs
@@ -119,7 +119,6 @@ pub(crate) fn patch(
|
|
|
|
|
|
| - | |
|
|
|
|
|
modified radicle-httpd/src/api/v1/projects.rs
@@ -648,12 +648,8 @@ async fn patch_update_handler(
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1741,7 +1737,6 @@ mod routes {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -1749,7 +1744,7 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1780,7 +1775,6 @@ mod routes {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -1788,7 +1782,7 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1806,7 +1800,7 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1858,7 +1852,6 @@ mod routes {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -1866,7 +1859,7 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1918,7 +1911,6 @@ mod routes {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -1929,7 +1921,7 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1981,7 +1973,6 @@ mod routes {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -1989,7 +1980,7 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2000,7 +1991,7 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2053,7 +2044,6 @@ mod routes {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -2061,7 +2051,7 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2135,7 +2125,6 @@ mod routes {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -2143,7 +2132,7 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2231,7 +2220,6 @@ mod routes {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -2239,7 +2227,7 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2314,7 +2302,6 @@ mod routes {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -2331,7 +2318,7 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-httpd/src/test.rs
@@ -38,9 +38,9 @@ pub const CONTRIBUTOR_RID: &str = "rad:z4XaCmN3jLSeiMvW15YTDpNbDHFhG";
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified radicle/src/cob/patch.rs
@@ -92,7 +92,6 @@ pub enum Error {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -160,8 +159,6 @@ pub enum MergeTarget {
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
@@ -180,7 +177,6 @@ pub struct Patch {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -194,7 +190,6 @@ impl Default for Patch {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -237,7 +232,7 @@ impl Patch {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -302,6 +297,16 @@ impl Patch {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -344,13 +349,8 @@ impl store::FromHistory for Patch {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
| - | |
|
|
|
|
|
@@ -829,15 +829,9 @@ impl Review {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
| - | |
|
|
|
|
|
@@ -989,11 +983,10 @@ impl<'a, 'g> PatchMut<'a, 'g> {
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1285,8 +1278,8 @@ impl<'a> Patches<'a> {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1367,7 +1360,6 @@ mod test {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -1518,7 +1510,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1978,7 +1970,10 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified radicle/src/cob/test.rs
@@ -202,7 +202,6 @@ impl<G: Signer> Actor<G, super::patch::Action> {
|
|
|
|
|
|
| - | |
|
|
|
|
|