mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-24 15:43:12 +00:00
0634dc5674
Branches move around a little confusigly with `abandon`. We do want to keep them, to test their behavior, but we can show the change id to make things clearer.
225 lines
7.7 KiB
Rust
225 lines
7.7 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;
|
|
|
|
pub mod common;
|
|
|
|
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]
|
|
"###);
|
|
|
|
// Abandoning `a` would normally result in its descendant merge commit, `e`,
|
|
// still having two parents. However, since one of those parents (the root
|
|
// commit) would be the ancestor of another, only one of the parents is kept.
|
|
test_env.jj_cmd_ok(&repo_path, &["undo"]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["abandon", "a"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Abandoned commit rlvkpnrz 2443ea76 a | a
|
|
Rebased 2 descendant commits onto parents of abandoned commits
|
|
Working copy now at: znkkpsqq b0af79c3 e | e
|
|
Parent commit : vruxwmqv b7c62f28 d | d
|
|
Added 0 files, modified 0 files, removed 1 files
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ [znk] e
|
|
◉ [vru] d
|
|
◉ [roy] c
|
|
│ ◉ [zsu] b
|
|
├─╯
|
|
◉ [zzz] a
|
|
"###);
|
|
|
|
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: wvuyspvk 3f93e69f (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###"
|
|
@ [wvu]
|
|
│ ◉ [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: oupztwtk 304ae338 (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###"
|
|
@ [oup]
|
|
│ ◉ [roy] c d e??
|
|
├─╯
|
|
◉ [zzz] a b e??
|
|
"###);
|
|
}
|
|
|
|
#[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 04:05:09.000 +07:00 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)"#,
|
|
],
|
|
)
|
|
}
|