mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-06 03:22:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

templater: inline RefTarget::has_add()

Browse source 
Since RefTarget::adds() now returns a slice, we don't need has_add() to bypass
temporary allocation of Vec<CommitId>.
This commit is contained in:
Yuya Nishihara 2023-07-07 19:37:23 +09:00
parent eebc2ef5a1
commit 43aca696c8
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/src/op_store.rs
View file

@ -158,13 +158,6 @@ impl RefTarget {
RefTarget::Conflict { removes: _, adds } => adds,
}
}
pub fn has_add(&self, needle: &CommitId) -> bool {
match self {
RefTarget::Normal(id) => id == needle,
RefTarget::Conflict { removes: _, adds } => adds.contains(needle),
}
}
}
content_hash! {

10
src/commit_templater.rs
View file

@ -287,7 +287,7 @@ fn extract_branches(repo: &dyn Repo, commit: &Commit) -> String {
for (branch_name, branch_target) in repo.view().branches() {
let local_target = branch_target.local_target.as_ref();
if let Some(local_target) = local_target {
if local_target.has_add(commit.id()) {
if local_target.adds().contains(commit.id()) {
if local_target.is_conflict() {
names.push(format!("{branch_name}??"));
} else if branch_target
@ -302,7 +302,7 @@ fn extract_branches(repo: &dyn Repo, commit: &Commit) -> String {
}
}
for (remote_name, remote_target) in &branch_target.remote_targets {
if Some(remote_target) != local_target && remote_target.has_add(commit.id()) {
if Some(remote_target) != local_target && remote_target.adds().contains(commit.id()) {
if remote_target.is_conflict() {
names.push(format!("{branch_name}@{remote_name}?"));
} else {
@ -318,7 +318,7 @@ fn extract_branches(repo: &dyn Repo, commit: &Commit) -> String {
fn extract_tags(repo: &dyn Repo, commit: &Commit) -> String {
let mut names = vec![];
for (tag_name, target) in repo.view().tags() {
if target.has_add(commit.id()) {
if target.adds().contains(commit.id()) {
if target.is_conflict() {
names.push(format!("{tag_name}?"));
} else {
@ -335,7 +335,7 @@ fn extract_git_refs(repo: &dyn Repo, commit: &Commit) -> String {
// all refs here.
let mut names = vec![];
for (name, target) in repo.view().git_refs() {
if target.has_add(commit.id()) {
if target.adds().contains(commit.id()) {
if target.is_conflict() {
names.push(format!("{name}?"));
} else {
@ -349,7 +349,7 @@ fn extract_git_refs(repo: &dyn Repo, commit: &Commit) -> String {
// TODO: return NameRef?
fn extract_git_head(repo: &dyn Repo, commit: &Commit) -> String {
match repo.view().git_head() {
Some(ref_target) if ref_target.has_add(commit.id()) => {
Some(ref_target) if ref_target.adds().contains(commit.id()) => {
if ref_target.is_conflict() {
"HEAD@git?".to_string()
} else {