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

cli: allow branch list to combine -r and -a

Browse source
This commit is contained in:
Simon Wollwage 2024-03-29 03:13:33 +09:00
parent bbe906b426
commit 8eed08b8b6
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -54,6 +54,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* `jj duplicate` and `jj abandon` can now take more than a single `-r` argument, * `jj duplicate` and `jj abandon` can now take more than a single `-r` argument,
for consistency with other commands. for consistency with other commands.
* `jj branch list` now allows combining `-r` and `-a` options.
### Fixed bugs ### Fixed bugs
## [0.15.1] - 2024-03-06 ## [0.15.1] - 2024-03-06

2
cli/src/commands/branch.rs
View file

@ -98,7 +98,7 @@ pub struct BranchDeleteArgs {
pub struct BranchListArgs { pub struct BranchListArgs {
/// Show all tracking and non-tracking remote branches including the ones /// Show all tracking and non-tracking remote branches including the ones
/// whose targets are synchronized with the local branches. /// whose targets are synchronized with the local branches.
#[arg(long, short, conflicts_with_all = ["names", "revisions", "tracked"])] #[arg(long, short, conflicts_with_all = ["names", "tracked"])]
all: bool, all: bool,
/// Show remote tracked branches only. Omits local Git-tracking branches by /// Show remote tracked branches only. Omits local Git-tracking branches by

8
cli/tests/test_branch_command.rs
View file

@ -1128,6 +1128,14 @@ fn test_branch_list_filtered() {
@origin (ahead by 1 commits, behind by 1 commits): xyxluytn hidden 3e9a5af6 (empty) remote-rewrite @origin (ahead by 1 commits, behind by 1 commits): xyxluytn hidden 3e9a5af6 (empty) remote-rewrite
"###); "###);
// Select branches by name, combined with --all
test_env.jj_cmd_ok(&local_path, &["git", "export"]);
insta::assert_snapshot!(query(&["--all", "-rbranches(remote-rewrite)"]), @r###"
remote-rewrite: xyxluytn e31634b6 (empty) rewritten
@git: xyxluytn e31634b6 (empty) rewritten
@origin (ahead by 1 commits, behind by 1 commits): xyxluytn hidden 3e9a5af6 (empty) remote-rewrite
"###);
// Can select deleted branch by name pattern, but not by revset. // Can select deleted branch by name pattern, but not by revset.
insta::assert_snapshot!(query(&["remote-delete"]), @r###" insta::assert_snapshot!(query(&["remote-delete"]), @r###"
remote-delete (deleted) remote-delete (deleted)