mirror of
https://github.com/martinvonz/jj.git
synced 2024-09-20 10:18:23 +03:00
e63ea86841
This allows us to use "if(description,)" to test empty description. And I think this change is unavoidable if we want to add support for commit template.
105 lines
3.8 KiB
Rust
105 lines
3.8 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 std::path::Path;
|
|
|
|
use crate::common::TestEnvironment;
|
|
|
|
pub mod common;
|
|
|
|
#[test]
|
|
fn test_checkout() {
|
|
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");
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["commit", "-m", "first"]);
|
|
test_env.jj_cmd_success(&repo_path, &["describe", "-m", "second"]);
|
|
|
|
// Check out current commit
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["checkout", "@"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Working copy now at: 05ce7118568d (no description set)
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ 05ce7118568d3007efc9163b055f9cb4a6becfde
|
|
o 5c52832c3483e0ace06d047a806024984f28f1d7 second
|
|
o 69542c1984c1f9d91f7c6c9c9e6941782c944bd9 first
|
|
o 0000000000000000000000000000000000000000
|
|
"###);
|
|
|
|
// Can provide a description
|
|
test_env.jj_cmd_success(&repo_path, &["checkout", "@--", "-m", "my message"]);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ 1191baaf276e3d0b96b1747e885b3a517be80d6f my message
|
|
| o 5c52832c3483e0ace06d047a806024984f28f1d7 second
|
|
|/
|
|
o 69542c1984c1f9d91f7c6c9c9e6941782c944bd9 first
|
|
o 0000000000000000000000000000000000000000
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_checkout_not_single_rev() {
|
|
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");
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["commit", "-m", "first"]);
|
|
test_env.jj_cmd_success(&repo_path, &["commit", "-m", "second"]);
|
|
test_env.jj_cmd_success(&repo_path, &["commit", "-m", "third"]);
|
|
test_env.jj_cmd_success(&repo_path, &["commit", "-m", "fourth"]);
|
|
test_env.jj_cmd_success(&repo_path, &["commit", "-m", "fifth"]);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["checkout", "root..@"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Revset "root..@" resolved to more than one revision
|
|
Hint: The revset resolved to these revisions:
|
|
2f8593712db5 (no description set)
|
|
5c1afd8b074f fifth
|
|
009f88bf7141 fourth
|
|
3fa8931e7b89 third
|
|
5c52832c3483 second
|
|
...
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["checkout", "root..@-"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Revset "root..@-" resolved to more than one revision
|
|
Hint: The revset resolved to these revisions:
|
|
5c1afd8b074f fifth
|
|
009f88bf7141 fourth
|
|
3fa8931e7b89 third
|
|
5c52832c3483 second
|
|
69542c1984c1 first
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["checkout", "@-|@--"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Revset "@-|@--" resolved to more than one revision
|
|
Hint: The revset resolved to these revisions:
|
|
5c1afd8b074f fifth
|
|
009f88bf7141 fourth
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["checkout", "none()"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Revset "none()" didn't resolve to any revisions
|
|
"###);
|
|
}
|
|
|
|
fn get_log_output(test_env: &TestEnvironment, cwd: &Path) -> String {
|
|
test_env.jj_cmd_success(cwd, &["log", "-T", r#"commit_id " " description"#])
|
|
}
|