mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-01 00:50:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

templater: include pseudo @git targets in branches keyword

Browse source 
#1666
This commit is contained in:
Yuya Nishihara 2023-07-08 01:49:28 +09:00
parent 2c3dd99f17
commit d58702cd63
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -110,9 +110,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
setting the `revsets.short-prefixes` config to a different revset. setting the `revsets.short-prefixes` config to a different revset.
* The last seen state of branches in the underlying git repo is now presented by * The last seen state of branches in the underlying git repo is now presented by
`jj branch list` as a remote called `git` (e.g. `main@git`). They can also be `jj branch list`/`jj log` as a remote called `git` (e.g. `main@git`). They can
referenced in revsets. Such branches exist in colocated repos or if you use also be referenced in revsets. Such branches exist in colocated repos or if
`jj git export`. you use `jj git export`.
* The new `jj chmod` command allows setting or removing the executable bit on * The new `jj chmod` command allows setting or removing the executable bit on
paths. Unlike the POSIX `chmod`, it works on Windows, on conflicted files, and paths. Unlike the POSIX `chmod`, it works on Windows, on conflicted files, and

5
src/commit_templater.rs
View file

@ -24,7 +24,7 @@ use jujutsu_lib::hex_util::to_reverse_hex;
use jujutsu_lib::id_prefix::IdPrefixContext; use jujutsu_lib::id_prefix::IdPrefixContext;
use jujutsu_lib::op_store::{RefTarget, WorkspaceId}; use jujutsu_lib::op_store::{RefTarget, WorkspaceId};
use jujutsu_lib::repo::Repo; use jujutsu_lib::repo::Repo;
use jujutsu_lib::rewrite; use jujutsu_lib::{git, rewrite};
use once_cell::unsync::OnceCell; use once_cell::unsync::OnceCell;
use crate::formatter::Formatter; use crate::formatter::Formatter;
@ -352,7 +352,8 @@ impl RefNamesIndex {
fn build_branches_index(repo: &dyn Repo) -> RefNamesIndex { fn build_branches_index(repo: &dyn Repo) -> RefNamesIndex {
let mut index = RefNamesIndex::default(); let mut index = RefNamesIndex::default();
for (branch_name, branch_target) in repo.view().branches() { let (all_branches, _) = git::build_unified_branches_map(repo.view());
for (branch_name, branch_target) in &all_branches {
let local_target = branch_target.local_target.as_ref(); let local_target = branch_target.local_target.as_ref();
let mut unsynced_remote_targets = branch_target let mut unsynced_remote_targets = branch_target
.remote_targets .remote_targets

2
tests/test_branch_command.rs
View file

@ -250,7 +250,7 @@ fn test_branch_forget_export() {
"###); "###);
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-r=foo@git", "--no-graph"]); let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-r=foo@git", "--no-graph"]);
insta::assert_snapshot!(stdout, @r###" insta::assert_snapshot!(stdout, @r###"
rlvkpnrzqnoo test.user@example.com 2001-02-03 04:05:08.000 +07:00 65b6b74e0897 rlvkpnrzqnoo test.user@example.com 2001-02-03 04:05:08.000 +07:00 foo@git 65b6b74e0897
(empty) (no description set) (empty) (no description set)
"###); "###);