mirror of
https://seed.radicle.dev/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5.git
synced 2026-11-21 18:40:39 +08:00
This patch changes separates the business logic of fetching from the process of fetching itself. It does this through a sans-IO approach, where a `Fetcher` provides the necessary state to help drive a fetch forward, without performing any of the IO itself. What the `Fetcher` cares about is: - What nodes are going to be attempted to be fetched from - In what order should they be attempted - When should the fetching process be considered finished The `Fetcher` is then used in `radicle-cli` to drive forward the `sync::fetch` function, allowing it to only care about the IO.
38 lines
1.1 KiB
Markdown
38 lines
1.1 KiB
Markdown
Now that the patch is merged, we can update our master branch to the canonical
|
|
master, which includes our patch.
|
|
|
|
First, we confirm that our master is behind:
|
|
```
|
|
$ git rev-parse master
|
|
f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
|
|
```
|
|
|
|
Then, we call `rad sync --fetch` to fetch from the maintainer:
|
|
```
|
|
$ rad sync --fetch
|
|
Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
|
|
✓ Target met: 1 seed(s)
|
|
🌱 Fetched from z6MknSL…StBU8Vi
|
|
```
|
|
|
|
Now let's checkout `master` and pull the maintainer's changes:
|
|
```
|
|
$ git checkout master
|
|
Your branch is up to date with 'rad/master'.
|
|
```
|
|
``` (stderr) RAD_SOCKET=/dev/null
|
|
$ git pull --all --ff
|
|
From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
|
|
f2de534..f567f69 master -> rad/master
|
|
From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
|
|
f2de534..f567f69 master -> alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master
|
|
```
|
|
|
|
Now our master branch is up to date with the maintainer's master:
|
|
|
|
```
|
|
$ git rev-parse master
|
|
f567f695d25b4e8fb63b5f5ad2a584529826e908
|
|
$ git diff master..alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master
|
|
```
|