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
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
use crate::{
file::{loose, path_to_name, Reference},
mutable::FullName,
store::{file, packed},
};
use std::{
cmp::Ordering,
io::Read,
iter::Peekable,
path::{Path, PathBuf},
};
pub struct LooseThenPacked<'p, 's> {
base: &'s Path,
packed: Option<Peekable<packed::Iter<'p>>>,
loose: Peekable<loose::iter::SortedLoosePaths>,
buf: Vec<u8>,
}
impl<'p, 's> LooseThenPacked<'p, 's> {
fn convert_packed(
&mut self,
packed: Result<packed::Reference<'p>, packed::iter::Error>,
) -> Result<Reference<'p>, Error> {
packed.map(Reference::Packed).map_err(|err| match err {
packed::iter::Error::Reference {
invalid_line,
line_number,
} => Error::PackedReference {
invalid_line,
line_number,
},
packed::iter::Error::Header { .. } => unreachable!("this one only happens on iteration creation"),
})
}
fn convert_loose(&mut self, res: std::io::Result<(PathBuf, FullName)>) -> Result<Reference<'p>, Error> {
let (refpath, name) = res.map_err(Error::Traversal)?;
std::fs::File::open(&refpath)
.and_then(|mut f| {
self.buf.clear();
f.read_to_end(&mut self.buf)
})
.map_err(Error::ReadFileContents)?;
loose::Reference::try_from_path(name, &self.buf)
.map_err(|err| Error::ReferenceCreation {
err,
relative_path: refpath.strip_prefix(&self.base).expect("base contains path").into(),
})
.map(Reference::Loose)
}
}
impl<'p, 's> Iterator for LooseThenPacked<'p, 's> {
type Item = Result<Reference<'p>, Error>;
fn next(&mut self) -> Option<Self::Item> {
match self.packed.as_mut() {
Some(packed_iter) => match (self.loose.peek(), packed_iter.peek()) {
(None, None) => None,
(None, Some(_)) | (Some(_), Some(Err(_))) => {
let res = packed_iter.next().expect("peeked value exists");
Some(self.convert_packed(res))
}
(Some(_), None) | (Some(Err(_)), Some(_)) => {
let res = self.loose.next().expect("peeked value exists");
Some(self.convert_loose(res))
}
(Some(Ok(loose)), Some(Ok(packed))) => {
let loose_name = loose.1.as_bstr();
match loose_name.cmp(packed.name.as_bstr()) {
Ordering::Less => {
let res = self.loose.next().expect("name retrieval configured");
Some(self.convert_loose(res))
}
Ordering::Equal => {
drop(packed_iter.next());
let res = self.loose.next().expect("peeked value exists");
Some(self.convert_loose(res))
}
Ordering::Greater => {
let res = packed_iter.next().expect("name retrieval configured");
Some(self.convert_packed(res))
}
}
}
},
None => self.loose.next().map(|res| self.convert_loose(res)),
}
}
}
impl file::Store {
pub fn iter<'p, 's>(&'s self, packed: Option<&'p packed::Buffer>) -> std::io::Result<LooseThenPacked<'p, 's>> {
Ok(LooseThenPacked {
base: &self.base,
packed: match packed {
Some(packed) => Some(
packed
.iter()
.map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))?
.peekable(),
),
None => None,
},
loose: loose::iter::SortedLoosePaths::at_root_with_names(self.refs_dir(), self.base.to_owned()).peekable(),
buf: Vec::new(),
})
}
pub fn iter_prefixed<'p, 's>(
&'s self,
packed: Option<&'p packed::Buffer>,
prefix: impl AsRef<Path>,
) -> std::io::Result<LooseThenPacked<'p, 's>> {
let packed_prefix = path_to_name(self.validate_prefix(prefix.as_ref())?);
Ok(LooseThenPacked {
base: &self.base,
packed: match packed {
Some(packed) => Some(
packed
.iter_prefixed(packed_prefix)
.map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))?
.peekable(),
),
None => None,
},
loose: loose::iter::SortedLoosePaths::at_root_with_names(self.base.join(prefix), self.base.to_owned())
.peekable(),
buf: Vec::new(),
})
}
}
mod error {
use crate::store::file;
use bstr::BString;
use quick_error::quick_error;
use std::{io, path::PathBuf};
quick_error! {
#[derive(Debug)]
#[allow(missing_docs)]
pub enum Error {
Traversal(err: io::Error) {
display("The file system could not be traversed")
source(err)
}
ReadFileContents(err: io::Error) {
display("The ref file could not be read in full")
source(err)
}
ReferenceCreation{ err: file::loose::reference::decode::Error, relative_path: PathBuf } {
display("The reference at '{}' could not be instantiated", relative_path.display())
source(err)
}
PackedReference { invalid_line: BString, line_number: usize } {
display("Invalid reference in line {}: '{}'", line_number, invalid_line)
}
}
}
}
pub use error::Error;