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
use bstr::ByteSlice;
use git_actor::SignatureRef;
use crate::Snapshot;
mod signature;
pub use signature::{ResolvedSignature, Signature};
mod util;
use util::EncodedStringRef;
mod entry;
pub(crate) use entry::EmailEntry;
impl Snapshot {
pub fn from_bytes(buf: &[u8]) -> Self {
Self::new(crate::parse_ignore_errors(buf))
}
pub fn new<'a>(entries: impl IntoIterator<Item = crate::Entry<'a>>) -> Self {
let mut snapshot = Self::default();
snapshot.merge(entries);
snapshot
}
pub fn merge<'a>(&mut self, entries: impl IntoIterator<Item = crate::Entry<'a>>) -> &mut Self {
for entry in entries {
let old_email: EncodedStringRef<'_> = entry.old_email.into();
assert!(
entry.new_name.is_some() || entry.new_email.is_some(),
"BUG: encountered entry without any mapped/new name or email."
);
match self
.entries_by_old_email
.binary_search_by(|e| e.old_email.cmp_ref(old_email))
{
Ok(pos) => self.entries_by_old_email[pos].merge(entry),
Err(insert_pos) => {
self.entries_by_old_email.insert(insert_pos, entry.into());
}
};
}
self
}
pub fn entries(&self) -> Vec<crate::Entry<'_>> {
let mut out = Vec::with_capacity(self.entries_by_old_email.len());
for entry in &self.entries_by_old_email {
if entry.new_email.is_some() || entry.new_name.is_some() {
out.push(crate::Entry {
new_name: entry.new_name.as_ref().map(|b| b.as_bstr()),
new_email: entry.new_email.as_ref().map(|b| b.as_bstr()),
old_name: None,
old_email: entry.old_email.as_bstr(),
});
}
for name_entry in &entry.entries_by_old_name {
out.push(crate::Entry {
new_name: name_entry.new_name.as_ref().map(|b| b.as_bstr()),
new_email: name_entry.new_email.as_ref().map(|b| b.as_bstr()),
old_name: name_entry.old_name.as_bstr().into(),
old_email: entry.old_email.as_bstr(),
});
}
}
out
}
pub fn try_resolve_ref(&self, signature: git_actor::SignatureRef<'_>) -> Option<ResolvedSignature<'_>> {
let email: EncodedStringRef<'_> = signature.email.into();
let pos = self
.entries_by_old_email
.binary_search_by(|e| e.old_email.cmp_ref(email))
.ok()?;
let entry = &self.entries_by_old_email[pos];
let name: EncodedStringRef<'_> = signature.name.into();
match entry.entries_by_old_name.binary_search_by(|e| e.old_name.cmp_ref(name)) {
Ok(pos) => {
let name_entry = &entry.entries_by_old_name[pos];
ResolvedSignature::try_new(
name_entry.new_email.as_ref(),
entry.old_email.as_bstr(),
signature.email,
name_entry.new_name.as_ref(),
)
}
Err(_) => ResolvedSignature::try_new(
entry.new_email.as_ref(),
entry.old_email.as_bstr(),
signature.email,
entry.new_name.as_ref(),
),
}
}
pub fn try_resolve(&self, signature: git_actor::SignatureRef<'_>) -> Option<git_actor::Signature> {
self.try_resolve_ref(signature)
.map(|new| enriched_signature(signature, new).into())
}
pub fn resolve(&self, signature: git_actor::SignatureRef<'_>) -> git_actor::Signature {
self.try_resolve(signature).unwrap_or_else(|| signature.to_owned())
}
pub fn resolve_cow<'a>(&self, signature: git_actor::SignatureRef<'a>) -> Signature<'a> {
self.try_resolve_ref(signature)
.map(|new| enriched_signature(signature, new))
.unwrap_or_else(|| signature.into())
}
}
fn enriched_signature<'a>(
SignatureRef { name, email, time }: SignatureRef<'a>,
new: ResolvedSignature<'_>,
) -> Signature<'a> {
match (new.email, new.name) {
(Some(new_email), Some(new_name)) => Signature {
email: new_email.to_owned().into(),
name: new_name.to_owned().into(),
time,
},
(Some(new_email), None) => Signature {
email: new_email.to_owned().into(),
name: name.into(),
time,
},
(None, Some(new_name)) => Signature {
email: email.into(),
name: new_name.to_owned().into(),
time,
},
(None, None) => unreachable!("BUG: ResolvedSignatures don't exist here when nothing is set"),
}
}