mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: Display correct merge author in rad patch show output

This commit is contained in:
Sebastian Martinez 2024-03-25 18:30:26 +01:00 committed by cloudhead
parent b495358c5f
commit 0a78b9cc5b
No known key found for this signature in database
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
radicle-cli/src/terminal/patch/timeline.rs
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 { if merge.revision == root {
Some(( Some((
merge.timestamp, merge.timestamp,
Update::Merged { Update::Merged {
author: Author::new(&revision.author().id, profile), author: Author::new(nid, profile),
merge: merge.clone(), merge: merge.clone(),
}, },
)) ))
@ -157,7 +157,7 @@ enum RevisionEntry<'a> {
impl<'a> RevisionEntry<'a> { impl<'a> RevisionEntry<'a> {
fn from_revision( fn from_revision(
patch: &Patch, patch: &'a Patch,
id: RevisionId, id: RevisionId,
revision: &'a Revision, revision: &'a Revision,
profile: &Profile, 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 { if merge.revision == id {
Some(( Some((
merge.timestamp, merge.timestamp,
Update::Merged { Update::Merged {
author: Author::new(&revision.author().id, profile), author: Author::new(nid, profile),
merge: merge.clone(), merge: merge.clone(),
}, },
)) ))