mirror of
https://github.com/martinvonz/jj.git
synced 2024-12-28 15:34:22 +00:00
e51878f4fd
As discussed in #2900, the milliseconds are rarely useful, and it can be confusing with different timezones because it makes harder to compare timestamps. I added an environment variable to control the timestamp in a cross-platform way. I didn't document because it exists only for tests (like `JJ_RANDOMNESS_SEED`). Closes #2900
371 lines
13 KiB
Rust
371 lines
13 KiB
Rust
// Copyright 2023 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;
|
|
|
|
fn create_commit(test_env: &TestEnvironment, repo_path: &Path, name: &str, parents: &[&str]) {
|
|
if parents.is_empty() {
|
|
test_env.jj_cmd_ok(repo_path, &["new", "root()", "-m", name]);
|
|
} else {
|
|
let mut args = vec!["new", "-m", name];
|
|
args.extend(parents);
|
|
test_env.jj_cmd_ok(repo_path, &args);
|
|
}
|
|
std::fs::write(repo_path.join(name), format!("{name}\n")).unwrap();
|
|
test_env.jj_cmd_ok(repo_path, &["branch", "create", name]);
|
|
}
|
|
|
|
#[test]
|
|
fn test_basics() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
create_commit(&test_env, &repo_path, "a", &[]);
|
|
create_commit(&test_env, &repo_path, "b", &["a"]);
|
|
create_commit(&test_env, &repo_path, "c", &[]);
|
|
create_commit(&test_env, &repo_path, "d", &["c"]);
|
|
create_commit(&test_env, &repo_path, "e", &["a", "d"]);
|
|
// Test the setup
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ [znk] e
|
|
├─╮
|
|
│ ◉ [vru] d
|
|
│ ◉ [roy] c
|
|
│ │ ◉ [zsu] b
|
|
├───╯
|
|
◉ │ [rlv] a
|
|
├─╯
|
|
◉ [zzz]
|
|
"###);
|
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["abandon", "d"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Abandoned commit vruxwmqv b7c62f28 d | d
|
|
Rebased 1 descendant commits onto parents of abandoned commits
|
|
Working copy now at: znkkpsqq 11a2e10e e | e
|
|
Parent commit : rlvkpnrz 2443ea76 a | a
|
|
Parent commit : royxmykx fe2e8e8b c d | c
|
|
Added 0 files, modified 0 files, removed 1 files
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ [znk] e
|
|
├─╮
|
|
│ ◉ [roy] c d
|
|
│ │ ◉ [zsu] b
|
|
├───╯
|
|
◉ │ [rlv] a
|
|
├─╯
|
|
◉ [zzz]
|
|
"###);
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["undo"]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["abandon"] /* abandons `e` */);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Abandoned commit znkkpsqq 5557ece3 e | e
|
|
Working copy now at: nkmrtpmo 6b527513 (empty) (no description set)
|
|
Parent commit : rlvkpnrz 2443ea76 a e?? | a
|
|
Added 0 files, modified 0 files, removed 3 files
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ [nkm]
|
|
│ ◉ [zsu] b
|
|
├─╯
|
|
◉ [rlv] a e??
|
|
│ ◉ [vru] d e??
|
|
│ ◉ [roy] c
|
|
├─╯
|
|
◉ [zzz]
|
|
"###);
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["undo"]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["abandon", "descendants(c)"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Abandoned the following commits:
|
|
znkkpsqq 5557ece3 e | e
|
|
vruxwmqv b7c62f28 d | d
|
|
royxmykx fe2e8e8b c | c
|
|
Working copy now at: xtnwkqum e7bb0612 (empty) (no description set)
|
|
Parent commit : rlvkpnrz 2443ea76 a e?? | a
|
|
Added 0 files, modified 0 files, removed 3 files
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ [xtn]
|
|
│ ◉ [zsu] b
|
|
├─╯
|
|
◉ [rlv] a e??
|
|
◉ [zzz] c d e??
|
|
"###);
|
|
|
|
// Test abandoning the same commit twice directly
|
|
test_env.jj_cmd_ok(&repo_path, &["undo"]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["abandon", "b", "b"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Abandoned commit zsuskuln 1394f625 b | b
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ [znk] e
|
|
├─╮
|
|
│ ◉ [vru] d
|
|
│ ◉ [roy] c
|
|
◉ │ [rlv] a b
|
|
├─╯
|
|
◉ [zzz]
|
|
"###);
|
|
|
|
// Test abandoning the same commit twice indirectly
|
|
test_env.jj_cmd_ok(&repo_path, &["undo"]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["abandon", "d::", "a::"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Abandoned the following commits:
|
|
znkkpsqq 5557ece3 e | e
|
|
vruxwmqv b7c62f28 d | d
|
|
zsuskuln 1394f625 b | b
|
|
rlvkpnrz 2443ea76 a | a
|
|
Working copy now at: xlzxqlsl af874bff (empty) (no description set)
|
|
Parent commit : zzzzzzzz 00000000 a b e?? | (empty) (no description set)
|
|
Added 0 files, modified 0 files, removed 4 files
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ [xlz]
|
|
│ ◉ [roy] c d e??
|
|
├─╯
|
|
◉ [zzz] a b e??
|
|
"###);
|
|
|
|
let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["abandon", "none()"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
No revisions to abandon.
|
|
"###);
|
|
}
|
|
|
|
// This behavior illustrates https://github.com/martinvonz/jj/issues/2600.
|
|
// See also the corresponding test in `test_rebase_command`
|
|
#[test]
|
|
fn test_bug_2600() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
// We will not touch "nottherootcommit". See the
|
|
// `test_bug_2600_rootcommit_special_case` for the one case where base being the
|
|
// child of the root commit changes the expected behavior.
|
|
create_commit(&test_env, &repo_path, "nottherootcommit", &[]);
|
|
create_commit(&test_env, &repo_path, "base", &["nottherootcommit"]);
|
|
create_commit(&test_env, &repo_path, "a", &["base"]);
|
|
create_commit(&test_env, &repo_path, "b", &["base", "a"]);
|
|
create_commit(&test_env, &repo_path, "c", &["b"]);
|
|
|
|
// Test the setup
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ [znk] c
|
|
◉ [vru] b
|
|
├─╮
|
|
│ ◉ [roy] a
|
|
├─╯
|
|
◉ [zsu] base
|
|
◉ [rlv] nottherootcommit
|
|
◉ [zzz]
|
|
"###);
|
|
let setup_opid = test_env.current_operation_id(&repo_path);
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["op", "restore", &setup_opid]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["abandon", "base"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Abandoned commit zsuskuln 73c929fc base | base
|
|
Rebased 3 descendant commits onto parents of abandoned commits
|
|
Working copy now at: znkkpsqq 86e31bec c | c
|
|
Parent commit : vruxwmqv fd6eb121 b | b
|
|
Added 0 files, modified 0 files, removed 1 files
|
|
"###);
|
|
// Commits "a" and "b" should both have "nottherootcommit" as parent, and "b"
|
|
// should keep "a" as second parent.
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ [znk] c
|
|
◉ [vru] b
|
|
├─╮
|
|
│ ◉ [roy] a
|
|
├─╯
|
|
◉ [rlv] base nottherootcommit
|
|
◉ [zzz]
|
|
"###);
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["op", "restore", &setup_opid]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["abandon", "a"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Abandoned commit royxmykx 98f3b9ba a | a
|
|
Rebased 2 descendant commits onto parents of abandoned commits
|
|
Working copy now at: znkkpsqq 683b9435 c | c
|
|
Parent commit : vruxwmqv c10cb7b4 b | b
|
|
Added 0 files, modified 0 files, removed 1 files
|
|
"###);
|
|
// Commit "b" should have "base" as parent. It should not have two parent
|
|
// pointers to that commit even though it was a merge commit before we abandoned
|
|
// "a".
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ [znk] c
|
|
◉ [vru] b
|
|
◉ [zsu] a base
|
|
◉ [rlv] nottherootcommit
|
|
◉ [zzz]
|
|
"###);
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["op", "restore", &setup_opid]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["abandon", "b"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Abandoned commit vruxwmqv 8c0dced0 b | b
|
|
Rebased 1 descendant commits onto parents of abandoned commits
|
|
Working copy now at: znkkpsqq 33a94991 c | c
|
|
Parent commit : zsuskuln 73c929fc b?? base | base
|
|
Parent commit : royxmykx 98f3b9ba a b?? | a
|
|
Added 0 files, modified 0 files, removed 1 files
|
|
"###);
|
|
// Commit "c" should inherit the parents from the abndoned commit "b".
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ [znk] c
|
|
├─╮
|
|
│ ◉ [roy] a b??
|
|
├─╯
|
|
◉ [zsu] b?? base
|
|
◉ [rlv] nottherootcommit
|
|
◉ [zzz]
|
|
"###);
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["op", "restore", &setup_opid]);
|
|
// ========= Reminder of the setup ===========
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ [znk] c
|
|
◉ [vru] b
|
|
├─╮
|
|
│ ◉ [roy] a
|
|
├─╯
|
|
◉ [zsu] base
|
|
◉ [rlv] nottherootcommit
|
|
◉ [zzz]
|
|
"###);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["abandon", "a", "b"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Abandoned the following commits:
|
|
vruxwmqv 8c0dced0 b | b
|
|
royxmykx 98f3b9ba a | a
|
|
Rebased 1 descendant commits onto parents of abandoned commits
|
|
Working copy now at: znkkpsqq 84fac1f8 c | c
|
|
Parent commit : zsuskuln 73c929fc a b base | base
|
|
Added 0 files, modified 0 files, removed 2 files
|
|
"###);
|
|
// Commit "c" should have "base" as parent. As when we abandoned "a", it should
|
|
// not have two parent pointers to the same commit.
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ [znk] c
|
|
◉ [zsu] a b base
|
|
◉ [rlv] nottherootcommit
|
|
◉ [zzz]
|
|
"###);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["branch", "list", "b"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
b: zsuskuln 73c929fc base
|
|
"###);
|
|
insta::assert_snapshot!(stderr, @"");
|
|
}
|
|
|
|
#[test]
|
|
fn test_bug_2600_rootcommit_special_case() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
// Set up like `test_bug_2600`, but without the `nottherootcommit` commit.
|
|
create_commit(&test_env, &repo_path, "base", &[]);
|
|
create_commit(&test_env, &repo_path, "a", &["base"]);
|
|
create_commit(&test_env, &repo_path, "b", &["base", "a"]);
|
|
create_commit(&test_env, &repo_path, "c", &["b"]);
|
|
|
|
// Setup
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ [vru] c
|
|
◉ [roy] b
|
|
├─╮
|
|
│ ◉ [zsu] a
|
|
├─╯
|
|
◉ [rlv] base
|
|
◉ [zzz]
|
|
"###);
|
|
|
|
// Now, the test
|
|
let stderr = test_env.jj_cmd_internal_error(&repo_path, &["abandon", "base"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Internal error: Merge failed
|
|
Caused by:
|
|
1: Backend error
|
|
2: The Git backend does not support creating merge commits with the root commit as one of the parents.
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_double_abandon() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
create_commit(&test_env, &repo_path, "a", &[]);
|
|
// Test the setup
|
|
insta::assert_snapshot!(
|
|
test_env.jj_cmd_success(&repo_path, &["log", "--no-graph", "-r", "a"])
|
|
, @r###"
|
|
rlvkpnrz test.user@example.com 2001-02-03 08:05:09 a 2443ea76
|
|
a
|
|
"###);
|
|
|
|
let commit_id = test_env.jj_cmd_success(
|
|
&repo_path,
|
|
&["log", "--no-graph", "--color=never", "-T=commit_id", "-r=a"],
|
|
);
|
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["abandon", &commit_id]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Abandoned commit rlvkpnrz 2443ea76 a | a
|
|
Working copy now at: royxmykx f37b4afd (empty) (no description set)
|
|
Parent commit : zzzzzzzz 00000000 a | (empty) (no description set)
|
|
Added 0 files, modified 0 files, removed 1 files
|
|
"###);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["abandon", &commit_id]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Abandoned commit rlvkpnrz hidden 2443ea76 a
|
|
Nothing changed.
|
|
"###);
|
|
}
|
|
|
|
fn get_log_output(test_env: &TestEnvironment, repo_path: &Path) -> String {
|
|
test_env.jj_cmd_success(
|
|
repo_path,
|
|
&[
|
|
"log",
|
|
"-T",
|
|
r#"separate(" ", "[" ++ change_id.short(3) ++ "]", branches)"#,
|
|
],
|
|
)
|
|
}
|