forked from mirrors/jj
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.
224 lines
7.8 KiB
Rust
224 lines
7.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;
|
|
|
|
#[test]
|
|
fn test_commit_with_description_from_cli() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
let workspace_path = test_env.env_root().join("repo");
|
|
|
|
// Description applies to the current working-copy (not the new one)
|
|
test_env.jj_cmd_ok(&workspace_path, &["commit", "-m=first"]);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r###"
|
|
@ e8ea92a8b6b3
|
|
◉ fa15625b4a98 first
|
|
◉ 000000000000
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_commit_with_editor() {
|
|
let mut test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
let workspace_path = test_env.env_root().join("repo");
|
|
|
|
// Check that the text file gets initialized with the current description and
|
|
// set a new one
|
|
test_env.jj_cmd_ok(&workspace_path, &["describe", "-m=initial"]);
|
|
let edit_script = test_env.set_up_fake_editor();
|
|
std::fs::write(&edit_script, ["dump editor0", "write\nmodified"].join("\0")).unwrap();
|
|
test_env.jj_cmd_ok(&workspace_path, &["commit"]);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r###"
|
|
@ a57b2c95fb75
|
|
◉ 159271101e05 modified
|
|
◉ 000000000000
|
|
"###);
|
|
insta::assert_snapshot!(
|
|
std::fs::read_to_string(test_env.env_root().join("editor0")).unwrap(), @r###"
|
|
initial
|
|
|
|
JJ: Lines starting with "JJ: " (like this one) will be removed.
|
|
"###);
|
|
|
|
// Check that the editor content includes diff summary
|
|
std::fs::write(workspace_path.join("file1"), "foo\n").unwrap();
|
|
std::fs::write(workspace_path.join("file2"), "foo\n").unwrap();
|
|
test_env.jj_cmd_ok(&workspace_path, &["describe", "-m=add files"]);
|
|
std::fs::write(&edit_script, "dump editor1").unwrap();
|
|
test_env.jj_cmd_ok(&workspace_path, &["commit"]);
|
|
insta::assert_snapshot!(
|
|
std::fs::read_to_string(test_env.env_root().join("editor1")).unwrap(), @r###"
|
|
add files
|
|
|
|
JJ: This commit contains the following changes:
|
|
JJ: A file1
|
|
JJ: A file2
|
|
|
|
JJ: Lines starting with "JJ: " (like this one) will be removed.
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_commit_interactive() {
|
|
let mut test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
let workspace_path = test_env.env_root().join("repo");
|
|
|
|
std::fs::write(workspace_path.join("file1"), "foo\n").unwrap();
|
|
std::fs::write(workspace_path.join("file2"), "bar\n").unwrap();
|
|
test_env.jj_cmd_ok(&workspace_path, &["describe", "-m=add files"]);
|
|
let edit_script = test_env.set_up_fake_editor();
|
|
std::fs::write(edit_script, ["dump editor"].join("\0")).unwrap();
|
|
|
|
let diff_editor = test_env.set_up_fake_diff_editor();
|
|
std::fs::write(diff_editor, "rm file2").unwrap();
|
|
|
|
// Create a commit interactively and select only file1
|
|
test_env.jj_cmd_ok(&workspace_path, &["commit", "-i"]);
|
|
|
|
insta::assert_snapshot!(
|
|
std::fs::read_to_string(test_env.env_root().join("editor")).unwrap(), @r###"
|
|
add files
|
|
|
|
JJ: This commit contains the following changes:
|
|
JJ: A file1
|
|
|
|
JJ: Lines starting with "JJ: " (like this one) will be removed.
|
|
"###);
|
|
|
|
// Try again with --tool=<name>, which implies --interactive
|
|
test_env.jj_cmd_ok(&workspace_path, &["undo"]);
|
|
test_env.jj_cmd_ok(
|
|
&workspace_path,
|
|
&[
|
|
"commit",
|
|
"--config-toml=ui.diff-editor='false'",
|
|
"--tool=fake-diff-editor",
|
|
],
|
|
);
|
|
|
|
insta::assert_snapshot!(
|
|
std::fs::read_to_string(test_env.env_root().join("editor")).unwrap(), @r###"
|
|
add files
|
|
|
|
JJ: This commit contains the following changes:
|
|
JJ: A file1
|
|
|
|
JJ: Lines starting with "JJ: " (like this one) will be removed.
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_commit_with_default_description() {
|
|
let mut test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
test_env.add_config(r#"ui.default-description = "\n\nTESTED=TODO""#);
|
|
let workspace_path = test_env.env_root().join("repo");
|
|
|
|
std::fs::write(workspace_path.join("file1"), "foo\n").unwrap();
|
|
std::fs::write(workspace_path.join("file2"), "bar\n").unwrap();
|
|
let edit_script = test_env.set_up_fake_editor();
|
|
std::fs::write(edit_script, ["dump editor"].join("\0")).unwrap();
|
|
test_env.jj_cmd_ok(&workspace_path, &["commit"]);
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r###"
|
|
@ c65242099289
|
|
◉ 573b6df51aea TESTED=TODO
|
|
◉ 000000000000
|
|
"###);
|
|
assert_eq!(
|
|
std::fs::read_to_string(test_env.env_root().join("editor")).unwrap(),
|
|
r#"
|
|
|
|
TESTED=TODO
|
|
JJ: This commit contains the following changes:
|
|
JJ: A file1
|
|
JJ: A file2
|
|
|
|
JJ: Lines starting with "JJ: " (like this one) will be removed.
|
|
"#
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_commit_without_working_copy() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
let workspace_path = test_env.env_root().join("repo");
|
|
|
|
test_env.jj_cmd_ok(&workspace_path, &["workspace", "forget"]);
|
|
let stderr = test_env.jj_cmd_failure(&workspace_path, &["commit", "-m=first"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: This command requires a working copy
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_commit_paths() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
let workspace_path = test_env.env_root().join("repo");
|
|
|
|
std::fs::write(workspace_path.join("file1"), "foo\n").unwrap();
|
|
std::fs::write(workspace_path.join("file2"), "bar\n").unwrap();
|
|
|
|
test_env.jj_cmd_ok(&workspace_path, &["commit", "-m=first", "file1"]);
|
|
let stdout = test_env.jj_cmd_success(&workspace_path, &["diff", "-r", "@-"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Added regular file file1:
|
|
1: foo
|
|
"###);
|
|
|
|
let stdout = test_env.jj_cmd_success(&workspace_path, &["diff"]);
|
|
insta::assert_snapshot!(stdout, @"
|
|
Added regular file file2:
|
|
1: bar
|
|
");
|
|
}
|
|
|
|
#[test]
|
|
fn test_commit_paths_warning() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
let workspace_path = test_env.env_root().join("repo");
|
|
|
|
std::fs::write(workspace_path.join("file1"), "foo\n").unwrap();
|
|
std::fs::write(workspace_path.join("file2"), "bar\n").unwrap();
|
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_path, &["commit", "-m=first", "file3"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Warning: The given paths do not match any file: file3
|
|
Working copy now at: rlvkpnrz d1872100 (no description set)
|
|
Parent commit : qpvuntsm fa15625b (empty) first
|
|
"###);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
|
|
let stdout = test_env.jj_cmd_success(&workspace_path, &["diff"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Added regular file file1:
|
|
1: foo
|
|
Added regular file file2:
|
|
1: bar
|
|
"###);
|
|
}
|
|
|
|
fn get_log_output(test_env: &TestEnvironment, cwd: &Path) -> String {
|
|
let template = r#"commit_id.short() ++ " " ++ description"#;
|
|
test_env.jj_cmd_success(cwd, &["log", "-T", template])
|
|
}
|