forked from mirrors/jj
Templater: Inline highlight_shortest_prefix_brackets
This commit is contained in:
parent
3ee87aa5a7
commit
bd37989b63
1 changed files with 12 additions and 16 deletions
|
@ -494,8 +494,18 @@ impl CommitOrChangeId<'_> {
|
||||||
hex
|
hex
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn shortest_prefix_and_brackets(&self) -> String {
|
fn shortest_prefix_and_brackets(&self) -> String {
|
||||||
highlight_shortest_prefix_brackets(self, 12)
|
let hex = self.hex();
|
||||||
|
let (prefix, rest) = extract_entire_prefix_and_trimmed_tail(
|
||||||
|
&hex,
|
||||||
|
self.repo.shortest_unique_id_prefix_len(self.as_bytes()),
|
||||||
|
12 - 2,
|
||||||
|
);
|
||||||
|
if rest.is_empty() {
|
||||||
|
prefix.to_string()
|
||||||
|
} else {
|
||||||
|
format!("{prefix}[{rest}]")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -551,20 +561,6 @@ mod tests {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn highlight_shortest_prefix_brackets(id: &CommitOrChangeId, total_len: usize) -> String {
|
|
||||||
let hex = id.hex();
|
|
||||||
let (prefix, rest) = extract_entire_prefix_and_trimmed_tail(
|
|
||||||
&hex,
|
|
||||||
id.repo.shortest_unique_id_prefix_len(id.as_bytes()),
|
|
||||||
total_len - 2,
|
|
||||||
);
|
|
||||||
if rest.is_empty() {
|
|
||||||
prefix.to_string()
|
|
||||||
} else {
|
|
||||||
format!("{prefix}[{rest}]")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct CommitOrChangeIdShort;
|
pub struct CommitOrChangeIdShort;
|
||||||
|
|
||||||
impl TemplateProperty<CommitOrChangeId<'_>> for CommitOrChangeIdShort {
|
impl TemplateProperty<CommitOrChangeId<'_>> for CommitOrChangeIdShort {
|
||||||
|
|
Loading…
Reference in a new issue