mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-07 04:51:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

cli: fix TODO about formatter label

Browse source 
Maybe something has changed since I added the TODO, but it seems the
problem it describes doesn't exist now.
This commit is contained in:
Martin von Zweigbergk 2021-10-27 16:25:27 -07:00
parent 3c6a922b97
commit 18f450e530
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/commands.rs
View file

@ -3194,8 +3194,6 @@ fn cmd_op_log(
struct OpTemplate;
impl Template<Operation> for OpTemplate {
fn format(&self, op: &Operation, formatter: &mut dyn Formatter) -> io::Result<()> {
// TODO: why can't this label be applied outside of the template?
formatter.add_label("op-log".to_string())?;
// TODO: Make this templated
formatter.add_label("id".to_string())?;
formatter.write_str(&op.id().hex()[0..12])?;
@ -3220,7 +3218,6 @@ fn cmd_op_log(
for (key, value) in &metadata.tags {
formatter.write_str(&format!("\n{}: {}", key, value))?;
}
formatter.remove_label()?;
Ok(())
}
@ -3241,7 +3238,9 @@ fn cmd_op_log(
{
let writer = Box::new(&mut buffer);
let mut formatter = ui.new_formatter(writer);
formatter.add_label("op-log".to_string())?;
template.format(&op, formatter.as_mut())?;
formatter.remove_label()?;
}
if !buffer.ends_with(b"\n") {
buffer.push(b'\n');