jj-cli 0.41.0

Jujutsu - an experimental version control system
Documentation 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139

// Copyright 2025 The Jujutsu Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

use crate::common::TestEnvironment;

#[test]
fn test_file_search() {
    let test_env = TestEnvironment::default();
    test_env.run_jj_in(".", ["git", "init", "repo"]).success();
    let work_dir = test_env.work_dir("repo");

    work_dir.write_file("file1", "-foo-");
    work_dir.write_file("file2", "-bar-");
    work_dir.run_jj(["new"]).success();
    work_dir.create_dir("dir");
    work_dir.write_file("dir/file3", "-foobar-");

    // Searches all files in the current revision by default
    let output = work_dir.run_jj(["file", "search", "--pattern=glob:*foo*"]);
    insta::assert_snapshot!(output.normalize_backslash(), @"
    dir/file3
    file1
    [EOF]
    ");

    // Matches only the whole line for glob pattern
    let output = work_dir.run_jj(["file", "search", "--pattern=glob:foo"]);
    insta::assert_snapshot!(output.normalize_backslash(), @"");

    // Can search files in another revision
    let output = work_dir.run_jj(["file", "search", "--pattern=glob:*foo*", "-r=@-"]);
    insta::assert_snapshot!(output.normalize_backslash(), @"
    file1
    [EOF]
    ");

    // Can filter by path
    let output = work_dir.run_jj(["file", "search", "--pattern=glob:*foo*", "dir"]);
    insta::assert_snapshot!(output.normalize_backslash(), @"
    dir/file3
    [EOF]
    ");

    // Warning if path doesn't exist
    let output = work_dir.run_jj(["file", "search", "--pattern=glob:*foo*", "file9"]);
    insta::assert_snapshot!(output.normalize_backslash(), @"
    ------- stderr -------
    Warning: No matching entries for paths: file9
    [EOF]
    ");

    // The default is regex
    let output = work_dir.run_jj(["file", "search", "--pattern=f.o"]);
    insta::assert_snapshot!(output.normalize_backslash(), @"
    dir/file3
    file1
    [EOF]
    ");

    // Can specify the kind
    let output = work_dir.run_jj(["file", "search", "--pattern=glob-i:*foo*"]);
    insta::assert_snapshot!(output.normalize_backslash(), @"
    dir/file3
    file1
    [EOF]
    ");

    // The part before the first colon is treated as the kind.
    let output = work_dir.run_jj(["file", "search", "--pattern=foo:bar"]);
    insta::assert_snapshot!(output.normalize_stderr_exit_status(), @"
    ------- stderr -------
    Error: Invalid string pattern kind `foo:`
    [EOF]
    [exit status: 2]
    ");

    // Colons can be in the pattern part.
    let output = work_dir.run_jj(["file", "search", "--pattern=regex-i:foo:bar"]);
    insta::assert_snapshot!(output.normalize_backslash(), @"");
}

#[test]
fn test_file_search_conflicts() {
    let test_env = TestEnvironment::default();
    test_env.run_jj_in(".", ["git", "init", "repo"]).success();
    let work_dir = test_env.work_dir("repo");

    work_dir.write_file("file1", "-foo-\n");
    work_dir.run_jj(["new"]).success();
    work_dir.write_file("file1", "-bar-\n");
    work_dir.run_jj(["new"]).success();
    work_dir.write_file("file1", "-baz-\n");
    work_dir.run_jj(["rebase", "-r=@", "-B=@-"]).success();

    // Test the setup
    insta::assert_snapshot!(work_dir.read_file("file1"), @r"
    <<<<<<< conflict 1 of 1
    %%%%%%% diff from: rlvkpnrz 60901f47 (parents of rebased revision)
    \\\\\\\        to: qpvuntsm fae24a95 (rebase destination)
    --bar-
    +-foo-
    +++++++ kkmpptxz 51957a05 (rebased revision)
    -baz-
    >>>>>>> conflict 1 of 1 ends
    ");

    // Matches positive terms
    let output = work_dir.run_jj(["file", "search", "--pattern=glob:*foo*"]);
    insta::assert_snapshot!(output.normalize_backslash(), @"
    file1
    [EOF]
    ");
    let output = work_dir.run_jj(["file", "search", "--pattern=glob:*bar*"]);
    insta::assert_snapshot!(output.normalize_backslash(), @"");
    let output = work_dir.run_jj(["file", "search", "--pattern=glob:*baz*"]);
    insta::assert_snapshot!(output.normalize_backslash(), @"
    file1
    [EOF]
    ");

    // Doesn't match the conflict markers
    let output = work_dir.run_jj(["file", "search", "--pattern=glob:*%%%*"]);
    insta::assert_snapshot!(output.normalize_backslash(), @"");

    // Doesn't list file if the pattern doesn't match
    let output = work_dir.run_jj(["file", "search", "--pattern=glob:*qux*"]);
    insta::assert_snapshot!(output.normalize_backslash(), @"");
}