cli: Display correct merge author in rad patch show output

This commit is contained in:
Sebastian Martinez
2024-04-03 15:11:34 +02:00
committed by cloudhead
parent b495358c5f
commit 0a78b9cc5b
+5 -5
View File
@@ -81,12 +81,12 @@ impl<'a> Opened<'a> {
},
)
}));
updates.extend(patch.merges().filter_map(|(_, merge)| {
updates.extend(patch.merges().filter_map(|(nid, merge)| {
if merge.revision == root {
Some((
merge.timestamp,
Update::Merged {
author: Author::new(&revision.author().id, profile),
author: Author::new(nid, profile),
merge: merge.clone(),
},
))
@@ -157,7 +157,7 @@ enum RevisionEntry<'a> {
impl<'a> RevisionEntry<'a> {
fn from_revision(
patch: &Patch,
patch: &'a Patch,
id: RevisionId,
revision: &'a Revision,
profile: &Profile,
@@ -171,12 +171,12 @@ impl<'a> RevisionEntry<'a> {
},
)
}));
updates.extend(patch.merges().filter_map(|(_, merge)| {
updates.extend(patch.merges().filter_map(|(nid, merge)| {
if merge.revision == id {
Some((
merge.timestamp,
Update::Merged {
author: Author::new(&revision.author().id, profile),
author: Author::new(nid, profile),
merge: merge.clone(),
},
))