1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
use anyhow::Result;
use clap::Parser;
use std::convert::TryInto;
use std::path::PathBuf;
// DEFAULT_MAX_PILE_SIZE removed; the new Pile API no longer uses a size const generic
use triblespace::prelude::BlobStore;
use triblespace::prelude::BlobStoreList;
use triblespace::prelude::BranchStore;
#[derive(Parser)]
pub enum BranchCommand {
/// Push a branch from a pile to a remote object store.
Push {
/// URL of the target object store
url: String,
/// Path to the source pile file
pile: PathBuf,
/// Branch identifier to push (hex encoded)
branch: String,
},
/// Pull a branch from a remote object store into a pile.
Pull {
/// URL of the source object store
url: String,
/// Path to the destination pile file
pile: PathBuf,
/// Branch identifier to pull (hex encoded)
branch: String,
},
}
pub fn run(cmd: BranchCommand) -> Result<()> {
match cmd {
BranchCommand::Push { url, pile, branch } => {
use triblespace_core::id::Id;
use triblespace_core::repo;
use triblespace_core::repo::objectstore::ObjectStoreRemote;
use triblespace_core::repo::pile::Pile;
use url::Url;
let url = Url::parse(&url)?;
let mut remote: ObjectStoreRemote = ObjectStoreRemote::with_url(&url)?;
let mut pile: Pile = Pile::open(&pile)?;
let res = (|| -> Result<(), anyhow::Error> {
let reader = pile
.reader()
.map_err(|e| anyhow::anyhow!("pile reader error: {e:?}"))?;
// The transfer API now takes an explicit iterator of handles to
// copy. Use the reader's blobs() listing and filter out any
// listing errors so we have a plain iterator of handles.
for r in repo::transfer(&reader, &mut remote, reader.blobs().filter_map(|r| r.ok()))
// TODO: We should log these errors to stderr.
{
r?;
}
let raw = hex::decode(branch)?;
let raw: [u8; 16] = raw.as_slice().try_into()?;
let id = Id::new(raw).ok_or_else(|| anyhow::anyhow!("bad id"))?;
let handle = pile
.head(id)?
.ok_or_else(|| anyhow::anyhow!("branch not found"))?;
let old = remote.head(id)?;
remote.update(id, old, Some(handle))?;
Ok(())
})();
let close_res = pile.close().map_err(|e| anyhow::anyhow!("{e:?}"));
res.and(close_res)?;
}
BranchCommand::Pull { url, pile, branch } => {
use triblespace_core::id::Id;
use triblespace_core::repo;
use triblespace_core::repo::objectstore::ObjectStoreRemote;
use triblespace_core::repo::pile::Pile;
use url::Url;
let url = Url::parse(&url)?;
let mut remote: ObjectStoreRemote = ObjectStoreRemote::with_url(&url)?;
// Pile::open no longer auto-creates the file; if the target
// is a fresh path, touch it first so the pull lands in a
// valid empty pile.
if !pile.exists() {
std::fs::File::create(&pile)?;
}
let mut pile: Pile = Pile::open(&pile)?;
let res = (|| -> Result<(), anyhow::Error> {
let reader = remote
.reader()
.map_err(|e| anyhow::anyhow!("remote reader error: {e:?}"))?;
// Copy all blobs reported by the remote reader into the local
// pile. Ignore transient listing errors and rely on transfer()
// to surface actual copy failures.
for r in repo::transfer(&reader, &mut pile, reader.blobs().filter_map(|r| r.ok())) {
// TODO: We should log these errors to stderr.
r?;
}
let raw = hex::decode(branch)?;
let raw: [u8; 16] = raw.as_slice().try_into()?;
let id = Id::new(raw).ok_or_else(|| anyhow::anyhow!("bad id"))?;
let handle = remote
.head(id)?
.ok_or_else(|| anyhow::anyhow!("branch not found"))?;
let old = pile.head(id)?;
pile.update(id, old, Some(handle))?;
Ok(())
})();
let close_res = pile.close().map_err(|e| anyhow::anyhow!("{e:?}"));
res.and(close_res)?;
}
}
Ok(())
}