ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

cli: unblock "branch list --all-remotes" with name patterns

Browse source 
Like -r/--revisions, it should be okay to filter synced/non-tracking remote
branches by name.

conflicts_with_all = "tracked" is redundant, so removed as well. The tracked
field declares that it conflicts with --all-remotes.
This commit is contained in:
Yuya Nishihara 2024-04-02 15:53:20 +09:00
parent e5b9e8ff58
commit acf8a8e1b2
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -54,7 +54,7 @@ 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,
for consistency with other commands.
* `jj branch list` now allows combining `-r` and `-a` options.
* `jj branch list` now allows combining `-r REVISIONS`/`NAMES` and `-a` options.
* `--all` is now named `--all-remotes` for `jj branch list`

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

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

5
cli/tests/test_branch_command.rs
View file

@ -1130,6 +1130,11 @@ fn test_branch_list_filtered() {
// Select branches by name, combined with --all-remotes
test_env.jj_cmd_ok(&local_path, &["git", "export"]);
insta::assert_snapshot!(query(&["--all-remotes", "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
"###);
insta::assert_snapshot!(query(&["--all-remotes", "-rbranches(remote-rewrite)"]), @r###"
remote-rewrite: xyxluytn e31634b6 (empty) rewritten
@git: xyxluytn e31634b6 (empty) rewritten