// Copyright 2022 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 indoc::indoc;use itertools::Itertools as _; use crate::common::create_commit;use crate::common::fake_diff_editor_path;use crate::common::to_toml_value;use crate::common::CommandOutput;use crate::common::TestEnvironment;use crate::common::TestWorkDir; #[test]fn test_diff_basic() {    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.write_file("file2", "1\n2\n3\n4\n");    work_dir.run_jj(["new"]).success();    work_dir.remove_file("file1");    work_dir.write_file("file2", "1\n5\n3\n");    work_dir.write_file("file3", "foo\n");    work_dir.write_file("file4", "1\n2\n3\n4\n");     let output = work_dir.run_jj(["diff"]);    insta::assert_snapshot!(output, @r"    Modified regular file file2:       1    1: 1       2    2: 25       3    3: 3       4     : 4    Modified regular file file3 (file1 => file3):    Modified regular file file4 (file2 => file4):    [EOF]    ");     let output = work_dir.run_jj(["diff", "--context=0"]);    insta::assert_snapshot!(output, @r"    Modified regular file file2:       1    1: 1       2    2: 25       3    3: 3       4     : 4    Modified regular file file3 (file1 => file3):    Modified regular file file4 (file2 => file4):    [EOF]    ");     let output = work_dir.run_jj(["diff", "--color=debug"]);    insta::assert_snapshot!(output, @r"    <<diff header::Modified regular file file2:>>    <<diff removed line_number::   1>><<diff:: >><<diff added line_number::   1>><<diff::: 1>>    <<diff removed line_number::   2>><<diff:: >><<diff added line_number::   2>><<diff::: >><<diff removed token::2>><<diff added token::5>><<diff::>>    <<diff removed line_number::   3>><<diff:: >><<diff added line_number::   3>><<diff::: 3>>    <<diff removed line_number::   4>><<diff::     : >><<diff removed token::4>>    <<diff header::Modified regular file file3 (file1 => file3):>>    <<diff header::Modified regular file file4 (file2 => file4):>>    [EOF]    ");     let output = work_dir.run_jj(["diff", "-s"]);    insta::assert_snapshot!(output, @r"    M file2    R {file1 => file3}    C {file2 => file4}    [EOF]    ");     let output = work_dir.run_jj(["diff", "--types"]);    insta::assert_snapshot!(output, @r"    FF file2    FF {file1 => file3}    FF {file2 => file4}    [EOF]    ");     let output = work_dir.run_jj(["diff", "--types", "glob:file[12]"]);    insta::assert_snapshot!(output, @r"    F- file1    FF file2    [EOF]    ");     let output = work_dir.run_jj(["diff", "--git", "file1"]);    insta::assert_snapshot!(output, @r"    diff --git a/file1 b/file1    deleted file mode 100644    index 257cc5642c..0000000000    --- a/file1    +++ /dev/null    @@ -1,1 +0,0 @@    -foo    [EOF]    ");     let output = work_dir.run_jj(["diff", "--git"]);    insta::assert_snapshot!(output, @r"    diff --git a/file2 b/file2    index 94ebaf9001..1ffc51b472 100644    --- a/file2    +++ b/file2    @@ -1,4 +1,3 @@     1    -2    +5     3    -4    diff --git a/file1 b/file3    rename from file1    rename to file3    diff --git a/file2 b/file4    copy from file2    copy to file4    [EOF]    ");     let output = work_dir.run_jj(["diff", "--git", "--context=0"]);    insta::assert_snapshot!(output, @r"    diff --git a/file2 b/file2    index 94ebaf9001..1ffc51b472 100644    --- a/file2    +++ b/file2    @@ -2,1 +2,1 @@    -2    +5    @@ -4,1 +3,0 @@    -4    diff --git a/file1 b/file3    rename from file1    rename to file3    diff --git a/file2 b/file4    copy from file2    copy to file4    [EOF]    ");     let output = work_dir.run_jj(["diff", "--git", "--color=debug"]);    insta::assert_snapshot!(output, @r"    <<diff file_header::diff --git a/file2 b/file2>>    <<diff file_header::index 94ebaf9001..1ffc51b472 100644>>    <<diff file_header::--- a/file2>>    <<diff file_header::+++ b/file2>>    <<diff hunk_header::@@ -1,4 +1,3 @@>>    <<diff context:: 1>>    <<diff removed::->><<diff removed token::2>><<diff removed::>>    <<diff added::+>><<diff added token::5>><<diff added::>>    <<diff context:: 3>>    <<diff removed::->><<diff removed token::4>>    <<diff file_header::diff --git a/file1 b/file3>>    <<diff file_header::rename from file1>>    <<diff file_header::rename to file3>>    <<diff file_header::diff --git a/file2 b/file4>>    <<diff file_header::copy from file2>>    <<diff file_header::copy to file4>>    [EOF]    ");     let output = work_dir.run_jj(["diff", "-s", "--git"]);    insta::assert_snapshot!(output, @r"    M file2    R {file1 => file3}    C {file2 => file4}    diff --git a/file2 b/file2    index 94ebaf9001..1ffc51b472 100644    --- a/file2    +++ b/file2    @@ -1,4 +1,3 @@     1    -2    +5     3    -4    diff --git a/file1 b/file3    rename from file1    rename to file3    diff --git a/file2 b/file4    copy from file2    copy to file4    [EOF]    ");     let output = work_dir.run_jj(["diff", "--stat"]);    insta::assert_snapshot!(output, @r"    file2            | 3 +--    {file1 => file3} | 0    {file2 => file4} | 0    3 files changed, 1 insertion(+), 2 deletions(-)    [EOF]    ");     // Filter by glob pattern    let output = work_dir.run_jj(["diff", "-s", "glob:file[12]"]);    insta::assert_snapshot!(output, @r"    D file1    M file2    [EOF]    ");     // Unmatched paths should generate warnings    let output = test_env.run_jj_in(        ".",        [            "diff",            "-Rrepo",            "-s",            "repo",       // matches directory            "repo/file1", // deleted in to_tree, but exists in from_tree            "repo/x",            "repo/y/z",        ],    );    insta::assert_snapshot!(output.normalize_backslash(), @r"    M repo/file2    R repo/{file1 => file3}    C repo/{file2 => file4}    [EOF]    ------- stderr -------    Warning: No matching entries for paths: repo/x, repo/y/z    [EOF]    ");     // Unmodified paths shouldn't generate warnings    let output = work_dir.run_jj(["diff", "-s", "--from=@", "file2"]);    insta::assert_snapshot!(output, @"");} #[test]fn test_diff_empty() {    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", "");    let output = work_dir.run_jj(["diff"]);    insta::assert_snapshot!(output, @r"    Added regular file file1:        (empty)    [EOF]    ");     work_dir.run_jj(["new"]).success();    work_dir.remove_file("file1");    let output = work_dir.run_jj(["diff"]);    insta::assert_snapshot!(output, @r"    Removed regular file file1:        (empty)    [EOF]    ");     let output = work_dir.run_jj(["diff", "--stat"]);    insta::assert_snapshot!(output, @r"    file1 | 0    1 file changed, 0 insertions(+), 0 deletions(-)    [EOF]    ");} #[test]fn test_diff_file_mode() {    let test_env = TestEnvironment::default();    test_env.run_jj_in(".", ["git", "init", "repo"]).success();    let work_dir = test_env.work_dir("repo");     // Test content+mode/mode-only changes of empty/non-empty files:    // - file1: ("",  x) -> ("2", n)  empty, content+mode    // - file2: ("1", x) -> ("1", n)  non-empty, mode-only    // - file3: ("1", n) -> ("2", x)  non-empty, content+mode    // - file4: ("",  n) -> ("",  x)  empty, mode-only     work_dir.write_file("file1", "");    work_dir.write_file("file2", "1\n");    work_dir.write_file("file3", "1\n");    work_dir.write_file("file4", "");    work_dir        .run_jj(["file", "chmod", "x", "file1", "file2"])        .success();     work_dir.run_jj(["new"]).success();    work_dir.write_file("file1", "2\n");    work_dir.write_file("file3", "2\n");    work_dir        .run_jj(["file", "chmod", "n", "file1", "file2"])        .success();    work_dir        .run_jj(["file", "chmod", "x", "file3", "file4"])        .success();     work_dir.run_jj(["new"]).success();    work_dir.remove_file("file1");    work_dir.remove_file("file2");    work_dir.remove_file("file3");    work_dir.remove_file("file4");     let output = work_dir.run_jj(["diff", "-r@--"]);    insta::assert_snapshot!(output, @r"    Added executable file file1:        (empty)    Added executable file file2:            1: 1    Added regular file file3:            1: 1    Added regular file file4:        (empty)    [EOF]    ");    let output = work_dir.run_jj(["diff", "-r@-"]);    insta::assert_snapshot!(output, @r"    Executable file became non-executable at file1:            1: 2    Executable file became non-executable at file2:    Non-executable file became executable at file3:       1    1: 12    Non-executable file became executable at file4:    [EOF]    ");    let output = work_dir.run_jj(["diff", "-r@"]);    insta::assert_snapshot!(output, @r"    Removed regular file file1:       1     : 2    Removed regular file file2:       1     : 1    Removed executable file file3:       1     : 2    Removed executable file file4:        (empty)    [EOF]    ");     let output = work_dir.run_jj(["diff", "-r@--", "--git"]);    insta::assert_snapshot!(output, @r"    diff --git a/file1 b/file1    new file mode 100755    index 0000000000..e69de29bb2    diff --git a/file2 b/file2    new file mode 100755    index 0000000000..d00491fd7e    --- /dev/null    +++ b/file2    @@ -0,0 +1,1 @@    +1    diff --git a/file3 b/file3    new file mode 100644    index 0000000000..d00491fd7e    --- /dev/null    +++ b/file3    @@ -0,0 +1,1 @@    +1    diff --git a/file4 b/file4    new file mode 100644    index 0000000000..e69de29bb2    [EOF]    ");    let output = work_dir.run_jj(["diff", "-r@-", "--git"]);    insta::assert_snapshot!(output, @r"    diff --git a/file1 b/file1    old mode 100755    new mode 100644    index e69de29bb2..0cfbf08886    --- a/file1    +++ b/file1    @@ -0,0 +1,1 @@    +2    diff --git a/file2 b/file2    old mode 100755    new mode 100644    diff --git a/file3 b/file3    old mode 100644    new mode 100755    index d00491fd7e..0cfbf08886    --- a/file3    +++ b/file3    @@ -1,1 +1,1 @@    -1    +2    diff --git a/file4 b/file4    old mode 100644    new mode 100755    [EOF]    ");    let output = work_dir.run_jj(["diff", "-r@", "--git"]);    insta::assert_snapshot!(output, @r"    diff --git a/file1 b/file1    deleted file mode 100644    index 0cfbf08886..0000000000    --- a/file1    +++ /dev/null    @@ -1,1 +0,0 @@    -2    diff --git a/file2 b/file2    deleted file mode 100644    index d00491fd7e..0000000000    --- a/file2    +++ /dev/null    @@ -1,1 +0,0 @@    -1    diff --git a/file3 b/file3    deleted file mode 100755    index 0cfbf08886..0000000000    --- a/file3    +++ /dev/null    @@ -1,1 +0,0 @@    -2    diff --git a/file4 b/file4    deleted file mode 100755    index e69de29bb2..0000000000    [EOF]    ");} #[test]fn test_diff_types() {    let test_env = TestEnvironment::default();    test_env.run_jj_in(".", ["git", "init", "repo"]).success();    let work_dir = test_env.work_dir("repo");     let file_path = "foo";     // Missing    work_dir.run_jj(["new", "root()", "-m=missing"]).success();     // Normal file    work_dir.run_jj(["new", "root()", "-m=file"]).success();    work_dir.write_file(file_path, "foo");     // Conflict (add/add)    work_dir.run_jj(["new", "root()", "-m=conflict"]).success();    work_dir.write_file(file_path, "foo");    work_dir.run_jj(["new", "root()"]).success();    work_dir.write_file(file_path, "bar");    work_dir        .run_jj(["squash", r#"--into=description("conflict")"#])        .success();     #[cfg(unix)]    {        use std::os::unix::fs::PermissionsExt as _;        use std::path::PathBuf;         // Executable        work_dir            .run_jj(["new", "root()", "-m=executable"])            .success();        work_dir.write_file(file_path, "foo");        std::fs::set_permissions(            work_dir.root().join(file_path),            std::fs::Permissions::from_mode(0o755),        )        .unwrap();         // Symlink        work_dir.run_jj(["new", "root()", "-m=symlink"]).success();        std::os::unix::fs::symlink(PathBuf::from("."), work_dir.root().join(file_path)).unwrap();    }     let diff = |from: &str, to: &str| {        work_dir.run_jj([            "diff",            "--types",            &format!(r#"--from=description("{from}")"#),            &format!(r#"--to=description("{to}")"#),        ])    };    insta::assert_snapshot!(diff("missing", "file"), @r"    -F foo    [EOF]    ");    insta::assert_snapshot!(diff("file", "conflict"), @r"    FC foo    [EOF]    ");    insta::assert_snapshot!(diff("conflict", "missing"), @r"    C- foo    [EOF]    ");     #[cfg(unix)]    {        insta::assert_snapshot!(diff("symlink", "file"), @r"        LF foo        [EOF]        ");        insta::assert_snapshot!(diff("missing", "executable"), @r"        -F foo        [EOF]        ");    }

Lines 1–500 of 2841. Load more