forked from mirrors/jj
6f8fb09609
Otherwise the description set by -m would differ from the one set by editor. This fixes test_describe() which says "make no changes", but previously "\n" would be added by the second "jj describe". As you can see, almost all hashes change in CLI tests. This means in-flight PRs will need to be rebased to update insta snapshots. Description text could be normalized by CommitBuilder, but the caller would have to normalize it beforehand to compare with the current description, so we would need an explicit function anyway. Another idea is to add a newtype that represents a normalized description, and make CommitBuilder require it. Commit::description() will return &Description in place of &str to ensure that commit.description() == raw_str wouldn't compile. Git CLI provides --cleanup=<mode> option to switch normalization rules, but I don't think we'll need such feature.
41 lines
1.6 KiB
Rust
41 lines
1.6 KiB
Rust
// 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 common::TestEnvironment;
|
|
|
|
pub mod common;
|
|
|
|
#[test]
|
|
fn test_status_merge() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
std::fs::write(repo_path.join("file"), "base").unwrap();
|
|
test_env.jj_cmd_success(&repo_path, &["new", "-m=left"]);
|
|
test_env.jj_cmd_success(&repo_path, &["branch", "create", "left"]);
|
|
test_env.jj_cmd_success(&repo_path, &["new", "@-", "-m=right"]);
|
|
std::fs::write(repo_path.join("file"), "right").unwrap();
|
|
test_env.jj_cmd_success(&repo_path, &["new", "left", "@"]);
|
|
|
|
// The output should mention each parent, and the diff should be empty (compared
|
|
// to the auto-merged parents)
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["status"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Parent commit: 9ae48ddba058 left
|
|
Parent commit: 29b991e938dd right
|
|
Working copy : c965365c98d2 (no description set)
|
|
The working copy is clean
|
|
"###);
|
|
}
|