mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-13 07:32:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

cli: key nodes in graphlog by position in index instead of by commit id

Browse source 
This speeds up `jj log -T "" -r ,,v2.0.0` in the git.git repo by about
1.6 dB (~31%).
This commit is contained in:
Martin von Zweigbergk 2021-04-24 10:54:39 -07:00
parent 0145be3693
commit 67ca161f24
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/commands.rs
View file

@ -1062,23 +1062,23 @@ fn cmd_log(
if use_graph { if use_graph {
let mut graph = AsciiGraphDrawer::new(&mut styler); let mut graph = AsciiGraphDrawer::new(&mut styler);
for index_entry in revset.iter() { for index_entry in revset.iter() {
let commit = store.get_commit(&index_entry.commit_id()).unwrap();
let mut edges = vec![]; let mut edges = vec![];
for parent in commit.parents() { for parent_position in index_entry.parent_positions() {
// TODO: Use the right kind of edge here. // TODO: Use the right kind of edge here.
edges.push(Edge::direct(parent.id().clone())); edges.push(Edge::direct(parent_position));
} }
let mut buffer = vec![]; let mut buffer = vec![];
// TODO: only use color if requested // TODO: only use color if requested
{ {
let writer = Box::new(&mut buffer); let writer = Box::new(&mut buffer);
let mut styler = ColorStyler::new(writer, ui.settings()); let mut styler = ColorStyler::new(writer, ui.settings());
let commit = store.get_commit(&index_entry.commit_id()).unwrap();
template.format(&commit, &mut styler)?; template.format(&commit, &mut styler)?;
} }
if !buffer.ends_with(b"\n") { if !buffer.ends_with(b"\n") {
buffer.push(b'\n'); buffer.push(b'\n');
} }
graph.add_node(commit.id(), &edges, b"o", &buffer)?; graph.add_node(&index_entry.position(), &edges, b"o", &buffer)?;
} }
} else { } else {
for index_entry in revset.iter() { for index_entry in revset.iter() {