mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-23 23:10:01 +00:00
1eebbe57c0
It's common to create empty working-copy commits while using jj, and currently the author timestamp for a commit is only set when it is first created. If you create an empty commit, then don't work on a repo for a few days, and then start working on a new feature without abandoning the working-copy commit, the author timestamp will remain as the time the commit was created rather than being updated to the time that work began or finished. This commit changes the behavior so that discardable commits (empty commits with no description) by the current user have their author timestamps reset when they are rewritten, meaning that the author timestamp will become finalized whenever a commit is given a description or becomes non-empty.
116 lines
5 KiB
Rust
116 lines
5 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;
|
|
|
|
#[test]
|
|
fn test_checkout() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "first"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "second"]);
|
|
|
|
// Check out current commit
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["checkout", "@"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Warning: `jj checkout` is deprecated; use `jj new` instead, which is equivalent
|
|
Warning: `jj checkout` will be removed in a future version, and this will be a hard error
|
|
Working copy now at: zsuskuln c97da310 (empty) (no description set)
|
|
Parent commit : rlvkpnrz 9ed53a4a (empty) second
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ c97da310c66008034013412d321397242e1e43ef
|
|
◉ 9ed53a4a1becd028f9a2fe0d5275973acea7e8da second
|
|
◉ fa15625b4a986997697639dfc2844138900c79f2 first
|
|
◉ 0000000000000000000000000000000000000000
|
|
"###);
|
|
|
|
// Can provide a description
|
|
test_env.jj_cmd_ok(&repo_path, &["checkout", "@--", "-m", "my message"]);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ 6f9c4a002224fde4ebc48ce6ec03d5ffcfa64ad2 my message
|
|
│ ◉ 9ed53a4a1becd028f9a2fe0d5275973acea7e8da second
|
|
├─╯
|
|
◉ fa15625b4a986997697639dfc2844138900c79f2 first
|
|
◉ 0000000000000000000000000000000000000000
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_checkout_not_single_rev() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "first"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "second"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "third"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "fourth"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "fifth"]);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["checkout", "root()..@"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Warning: `jj checkout` is deprecated; use `jj new` instead, which is equivalent
|
|
Warning: `jj checkout` will be removed in a future version, and this will be a hard error
|
|
Error: Revset "root()..@" resolved to more than one revision
|
|
Hint: The revset "root()..@" resolved to these revisions:
|
|
royxmykx 554d2245 (empty) (no description set)
|
|
mzvwutvl a497e2bf (empty) fifth
|
|
zsuskuln 9d7e5e99 (empty) fourth
|
|
kkmpptxz 30056b0c (empty) third
|
|
rlvkpnrz 9ed53a4a (empty) second
|
|
...
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["checkout", "root()..@-"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Warning: `jj checkout` is deprecated; use `jj new` instead, which is equivalent
|
|
Warning: `jj checkout` will be removed in a future version, and this will be a hard error
|
|
Error: Revset "root()..@-" resolved to more than one revision
|
|
Hint: The revset "root()..@-" resolved to these revisions:
|
|
mzvwutvl a497e2bf (empty) fifth
|
|
zsuskuln 9d7e5e99 (empty) fourth
|
|
kkmpptxz 30056b0c (empty) third
|
|
rlvkpnrz 9ed53a4a (empty) second
|
|
qpvuntsm fa15625b (empty) first
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["checkout", "@-|@--"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Warning: `jj checkout` is deprecated; use `jj new` instead, which is equivalent
|
|
Warning: `jj checkout` will be removed in a future version, and this will be a hard error
|
|
Error: Revset "@-|@--" resolved to more than one revision
|
|
Hint: The revset "@-|@--" resolved to these revisions:
|
|
mzvwutvl a497e2bf (empty) fifth
|
|
zsuskuln 9d7e5e99 (empty) fourth
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["checkout", "none()"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Warning: `jj checkout` is deprecated; use `jj new` instead, which is equivalent
|
|
Warning: `jj checkout` will be removed in a future version, and this will be a hard error
|
|
Error: Revset "none()" didn't resolve to any revisions
|
|
"###);
|
|
}
|
|
|
|
fn get_log_output(test_env: &TestEnvironment, cwd: &Path) -> String {
|
|
let template = r#"commit_id ++ " " ++ description"#;
|
|
test_env.jj_cmd_success(cwd, &["log", "-T", template])
|
|
}
|