mirror of
https://github.com/martinvonz/jj.git
synced 2024-12-28 23:55:54 +00:00
fb33620f9e
The original idea was similar to Mercurial's "topo" sorting, but it was bad at handling merge-heavy history. In order to render merges of topic branches nicely, we need to prioritize branches at merge point, not at fork point. OTOH, we do also want to place unmerged branches as close to the fork point as possible. This commit implements the former requirement, and the latter will be addressed by the next commit. I think this is similar to Git's sorting logic described in the following blog post. In our case, the in-degree walk can be dumb since topological order is guaranteed by the index. We keep HashSet<CommitId> instead of an in-degree integer value, which will be used in the next commit to resolve new heads as late as possible. https://github.blog/2022-08-30-gits-database-internals-ii-commit-history-queries/#topological-sorting Compared to Sapling's beautify_graph(), this is lazy, and can roughly preserve the index (or chronological) order. I tried beautify_graph() with prioritizing the @ commit, but the result seemed too aggressively reordered. Perhaps, for more complex history, beautify_graph() would produce a better result. For my wip branches (~30 branches, a couple of commits per branch), this works pretty well. #242
202 lines
6.8 KiB
Rust
202 lines
6.8 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],
|
|
files: &[(&str, &str)],
|
|
) {
|
|
if parents.is_empty() {
|
|
test_env.jj_cmd_success(repo_path, &["new", "root", "-m", name]);
|
|
} else {
|
|
let mut args = vec!["new", "-m", name];
|
|
args.extend(parents);
|
|
test_env.jj_cmd_success(repo_path, &args);
|
|
}
|
|
for (name, content) in files {
|
|
std::fs::write(repo_path.join(name), content).unwrap();
|
|
}
|
|
test_env.jj_cmd_success(repo_path, &["branch", "create", name]);
|
|
}
|
|
|
|
fn get_log_output(test_env: &TestEnvironment, repo_path: &Path) -> String {
|
|
test_env.jj_cmd_success(repo_path, &["log", "-T", "branches"])
|
|
}
|
|
|
|
#[test]
|
|
fn test_chmod_regular_conflict() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
create_commit(&test_env, &repo_path, "base", &[], &[("file", "base\n")]);
|
|
create_commit(&test_env, &repo_path, "n", &["base"], &[("file", "n\n")]);
|
|
create_commit(&test_env, &repo_path, "x", &["base"], &[("file", "x\n")]);
|
|
// Test chmodding a file. The effect will be visible in the conflict below.
|
|
test_env.jj_cmd_success(&repo_path, &["chmod", "x", "file", "-r=x"]);
|
|
create_commit(&test_env, &repo_path, "conflict", &["x", "n"], &[]);
|
|
|
|
// Test the setup
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ conflict
|
|
├─╮
|
|
│ ◉ n
|
|
◉ │ x
|
|
├─╯
|
|
◉ base
|
|
◉
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["cat", "file"]);
|
|
insta::assert_snapshot!(stdout,
|
|
@r###"
|
|
Conflict:
|
|
Removing file with id df967b96a579e45a18b8251732d16804b2e56a55
|
|
Adding executable file with id 587be6b4c3f93f93c489c0111bba5596147a26cb
|
|
Adding file with id 8ba3a16384aacc37d01564b28401755ce8053f51
|
|
"###);
|
|
|
|
// Test chmodding a conflict
|
|
test_env.jj_cmd_success(&repo_path, &["chmod", "x", "file"]);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["cat", "file"]);
|
|
insta::assert_snapshot!(stdout,
|
|
@r###"
|
|
Conflict:
|
|
Removing executable file with id df967b96a579e45a18b8251732d16804b2e56a55
|
|
Adding executable file with id 587be6b4c3f93f93c489c0111bba5596147a26cb
|
|
Adding executable file with id 8ba3a16384aacc37d01564b28401755ce8053f51
|
|
"###);
|
|
test_env.jj_cmd_success(&repo_path, &["chmod", "n", "file"]);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["cat", "file"]);
|
|
insta::assert_snapshot!(stdout,
|
|
@r###"
|
|
<<<<<<<
|
|
%%%%%%%
|
|
-base
|
|
+x
|
|
+++++++
|
|
n
|
|
>>>>>>>
|
|
"###);
|
|
|
|
// An error prevents `chmod` from making any changes.
|
|
// In this case, the failure with `nonexistent` prevents any changes to `file`.
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["chmod", "x", "nonexistent", "file"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: No such path at 'nonexistent'.
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["cat", "file"]);
|
|
insta::assert_snapshot!(stdout,
|
|
@r###"
|
|
<<<<<<<
|
|
%%%%%%%
|
|
-base
|
|
+x
|
|
+++++++
|
|
n
|
|
>>>>>>>
|
|
"###);
|
|
}
|
|
|
|
// TODO: Test demonstrating that conflicts whose *base* is not a file are
|
|
// chmod-dable
|
|
|
|
#[test]
|
|
fn test_chmod_file_dir_deletion_conflicts() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
create_commit(&test_env, &repo_path, "base", &[], &[("file", "base\n")]);
|
|
create_commit(&test_env, &repo_path, "file", &["base"], &[("file", "a\n")]);
|
|
|
|
create_commit(&test_env, &repo_path, "deletion", &["base"], &[]);
|
|
std::fs::remove_file(repo_path.join("file")).unwrap();
|
|
|
|
create_commit(&test_env, &repo_path, "dir", &["base"], &[]);
|
|
std::fs::remove_file(repo_path.join("file")).unwrap();
|
|
std::fs::create_dir(repo_path.join("file")).unwrap();
|
|
// Without a placeholder file, `jj` ignores an empty directory
|
|
std::fs::write(repo_path.join("file").join("placeholder"), "").unwrap();
|
|
|
|
// Create a file-dir conflict and a file-deletion conflict
|
|
create_commit(&test_env, &repo_path, "file_dir", &["file", "dir"], &[]);
|
|
create_commit(
|
|
&test_env,
|
|
&repo_path,
|
|
"file_deletion",
|
|
&["file", "deletion"],
|
|
&[],
|
|
);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ file_deletion
|
|
├─╮
|
|
◉ │ deletion
|
|
│ │ ◉ file_dir
|
|
│ ╭─┤
|
|
│ ◉ │ file
|
|
├─╯ │
|
|
│ ◉ dir
|
|
├───╯
|
|
◉ base
|
|
◉
|
|
"###);
|
|
|
|
// The file-dir conflict cannot be chmod-ed
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["cat", "-r=file_dir", "file"]);
|
|
insta::assert_snapshot!(stdout,
|
|
@r###"
|
|
Conflict:
|
|
Removing file with id df967b96a579e45a18b8251732d16804b2e56a55
|
|
Adding file with id 78981922613b2afb6025042ff6bd878ac1994e85
|
|
Adding tree with id 133bb38fc4e4bf6b551f1f04db7e48f04cac2877
|
|
"###);
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["chmod", "x", "file", "-r=file_dir"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: None of the sides of the conflict are files at 'file'.
|
|
"###);
|
|
|
|
// The file_deletion conflict can be chmod-ed
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["cat", "-r=file_deletion", "file"]);
|
|
insta::assert_snapshot!(stdout,
|
|
@r###"
|
|
<<<<<<<
|
|
+++++++
|
|
a
|
|
%%%%%%%
|
|
-base
|
|
>>>>>>>
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["chmod", "x", "file", "-r=file_deletion"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Working copy now at: 85942d954f00 file_deletion
|
|
Parent commit : c51c9c55bad4 file
|
|
Parent commit : 6b18b3c1578d deletion
|
|
Added 0 files, modified 1 files, removed 0 files
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["cat", "-r=file_deletion", "file"]);
|
|
insta::assert_snapshot!(stdout,
|
|
@r###"
|
|
Conflict:
|
|
Removing executable file with id df967b96a579e45a18b8251732d16804b2e56a55
|
|
Adding executable file with id 78981922613b2afb6025042ff6bd878ac1994e85
|
|
"###);
|
|
}
|