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.
121 lines
4.6 KiB
Rust
121 lines
4.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 std::path::Path;
|
|
|
|
use crate::common::TestEnvironment;
|
|
|
|
#[test]
|
|
fn test_edit() {
|
|
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");
|
|
std::fs::write(repo_path.join("file1"), "0").unwrap();
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "first"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "second"]);
|
|
std::fs::write(repo_path.join("file1"), "1").unwrap();
|
|
|
|
// Errors out without argument
|
|
let stderr = test_env.jj_cmd_cli_error(&repo_path, &["edit"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
error: the following required arguments were not provided:
|
|
<REVISION>
|
|
|
|
Usage: jj edit <REVISION>
|
|
|
|
For more information, try '--help'.
|
|
"###);
|
|
|
|
// Makes the specified commit the working-copy commit
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["edit", "@-"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Working copy now at: qpvuntsm 73383c0b first
|
|
Parent commit : zzzzzzzz 00000000 (empty) (no description set)
|
|
Added 0 files, modified 1 files, removed 0 files
|
|
"###);
|
|
let (stdout, stderr) = get_log_output_with_stderr(&test_env, &repo_path);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
◉ 2c910ae2d628 second
|
|
@ 73383c0b6439 first
|
|
◉ 000000000000
|
|
"###);
|
|
insta::assert_snapshot!(stderr, @"");
|
|
insta::assert_snapshot!(read_file(&repo_path.join("file1")), @"0");
|
|
|
|
// Changes in the working copy are amended into the commit
|
|
std::fs::write(repo_path.join("file2"), "0").unwrap();
|
|
let (stdout, stderr) = get_log_output_with_stderr(&test_env, &repo_path);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
◉ b384b2cc1883 second
|
|
@ ff3f7b0dc386 first
|
|
◉ 000000000000
|
|
"###);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Rebased 1 descendant commits onto updated working copy
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
// Windows says "Access is denied" when trying to delete the object file.
|
|
#[cfg(unix)]
|
|
fn test_edit_current_wc_commit_missing() {
|
|
use crate::common::get_stderr_string;
|
|
|
|
// Test that we get a reasonable error message when the current working-copy
|
|
// commit is missing
|
|
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"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["edit", "@-"]);
|
|
|
|
let wc_id = test_env.jj_cmd_success(&repo_path, &["log", "--no-graph", "-T=commit_id", "-r=@"]);
|
|
let wc_child_id =
|
|
test_env.jj_cmd_success(&repo_path, &["log", "--no-graph", "-T=commit_id", "-r=@+"]);
|
|
// Make the Git backend fail to read the current working copy commit
|
|
let commit_object_path = repo_path
|
|
.join(".jj")
|
|
.join("repo")
|
|
.join("store")
|
|
.join("git")
|
|
.join("objects")
|
|
.join(&wc_id[..2])
|
|
.join(&wc_id[2..]);
|
|
std::fs::remove_file(commit_object_path).unwrap();
|
|
|
|
// Pass --ignore-working-copy to avoid triggering the error at snapshot time
|
|
let assert = test_env
|
|
.jj_cmd(&repo_path, &["edit", "--ignore-working-copy", &wc_child_id])
|
|
.assert()
|
|
.code(255);
|
|
insta::assert_snapshot!(get_stderr_string(&assert), @r###"
|
|
Internal error: Failed to edit a commit
|
|
Caused by:
|
|
1: Current working-copy commit not found
|
|
2: Object fa15625b4a986997697639dfc2844138900c79f2 of type commit not found
|
|
3: An object with id fa15625b4a986997697639dfc2844138900c79f2 could not be found
|
|
"###);
|
|
}
|
|
|
|
fn read_file(path: &Path) -> String {
|
|
String::from_utf8(std::fs::read(path).unwrap()).unwrap()
|
|
}
|
|
|
|
fn get_log_output_with_stderr(test_env: &TestEnvironment, cwd: &Path) -> (String, String) {
|
|
let template = r#"commit_id.short() ++ " " ++ description"#;
|
|
test_env.jj_cmd_ok(cwd, &["log", "-T", template])
|
|
}
|