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

templater: consistently use double ?? to denote conflicted refs

Browse source 
I think this is just a remainder of 65de7cb0eb "`jj log`: Change conflicted
branches from `br?` to `br??`."
This commit is contained in:
Yuya Nishihara 2023-10-25 15:30:07 +09:00
parent b30d5bf1c7
commit f7f08cbe77
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cli/src/commit_templater.rs
View file

@ -385,7 +385,7 @@ fn build_branches_index(repo: &dyn Repo) -> RefNamesIndex {
} }
for (remote_name, remote_ref) in unsynced_remote_refs { for (remote_name, remote_ref) in unsynced_remote_refs {
let decorated_name = if remote_ref.target.has_conflict() { let decorated_name = if remote_ref.target.has_conflict() {
format!("{branch_name}@{remote_name}?") format!("{branch_name}@{remote_name}??")
} else { } else {
format!("{branch_name}@{remote_name}") format!("{branch_name}@{remote_name}")
}; };
@ -401,7 +401,7 @@ fn build_ref_names_index<'a>(
let mut index = RefNamesIndex::default(); let mut index = RefNamesIndex::default();
for (name, target) in ref_pairs { for (name, target) in ref_pairs {
let decorated_name = if target.has_conflict() { let decorated_name = if target.has_conflict() {
format!("{name}?") format!("{name}??")
} else { } else {
name.clone() name.clone()
}; };
@ -415,7 +415,7 @@ fn extract_git_head(repo: &dyn Repo, commit: &Commit) -> String {
let target = repo.view().git_head(); let target = repo.view().git_head();
if target.added_ids().contains(commit.id()) { if target.added_ids().contains(commit.id()) {
if target.has_conflict() { if target.has_conflict() {
"HEAD@git?".to_string() "HEAD@git??".to_string()
} else { } else {
"HEAD@git".to_string() "HEAD@git".to_string()
} }