ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

workspace: consider .git symlink when generating relative git_target path

Browse source 
Before, an absolute path would be saved in the git_target file if .git is a
symlink. That's not wrong, but seemed a bit weird. Let's consolidate the
behavior across .git file types.
This commit is contained in:
Yuya Nishihara 2023-10-30 18:53:19 +09:00 committed by Martin von Zweigbergk
parent 787fa1340b
commit 25fcc3e403
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cli/tests/test_init_command.rs
View file

@ -230,6 +230,7 @@ fn test_init_git_colocated_gitlink() {
Done importing changes from the underlying Git repo. Done importing changes from the underlying Git repo.
Initialized repo in "." Initialized repo in "."
"###); "###);
insta::assert_snapshot!(read_git_target(&workspace_root), @"../../../.git");
// Check that the Git repo's HEAD got checked out // Check that the Git repo's HEAD got checked out
let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]);
@ -265,6 +266,7 @@ fn test_init_git_colocated_symlink_directory() {
Done importing changes from the underlying Git repo. Done importing changes from the underlying Git repo.
Initialized repo in "." Initialized repo in "."
"###); "###);
insta::assert_snapshot!(read_git_target(&workspace_root), @"../../../.git");
// Check that the Git repo's HEAD got checked out // Check that the Git repo's HEAD got checked out
let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]);
@ -303,6 +305,7 @@ fn test_init_git_colocated_symlink_directory_without_bare_config() {
Done importing changes from the underlying Git repo. Done importing changes from the underlying Git repo.
Initialized repo in "." Initialized repo in "."
"###); "###);
insta::assert_snapshot!(read_git_target(&workspace_root), @"../../../.git");
// Check that the Git repo's HEAD got checked out // Check that the Git repo's HEAD got checked out
let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]);
@ -343,6 +346,7 @@ fn test_init_git_colocated_symlink_gitlink() {
Done importing changes from the underlying Git repo. Done importing changes from the underlying Git repo.
Initialized repo in "." Initialized repo in "."
"###); "###);
insta::assert_snapshot!(read_git_target(&workspace_root), @"../../../.git");
// Check that the Git repo's HEAD got checked out // Check that the Git repo's HEAD got checked out
let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]);

2
lib/src/git_backend.rs
View file

@ -373,7 +373,7 @@ impl GitBackend {
/// config. This config is usually set, but the "repo" tool will set up such /// config. This config is usually set, but the "repo" tool will set up such
/// repositories and symlinks. Opening such repo with fully-canonicalized path /// repositories and symlinks. Opening such repo with fully-canonicalized path
/// would turn a colocated Git repo into a bare repo. /// would turn a colocated Git repo into a bare repo.
fn canonicalize_git_repo_path(path: &Path) -> io::Result<PathBuf> { pub fn canonicalize_git_repo_path(path: &Path) -> io::Result<PathBuf> {
if path.ends_with(".git") { if path.ends_with(".git") {
let workdir = path.parent().unwrap(); let workdir = path.parent().unwrap();
workdir.canonicalize().map(|dir| dir.join(".git")) workdir.canonicalize().map(|dir| dir.join(".git"))

22
lib/src/workspace.rs
View file

@ -26,7 +26,7 @@ use thiserror::Error;
use crate::backend::{Backend, BackendInitError, MergedTreeId}; use crate::backend::{Backend, BackendInitError, MergedTreeId};
use crate::commit::Commit; use crate::commit::Commit;
use crate::file_util::{self, IoResultExt as _, PathError}; use crate::file_util::{self, IoResultExt as _, PathError};
use crate::git_backend::GitBackend; use crate::git_backend::{canonicalize_git_repo_path, GitBackend};
use crate::local_backend::LocalBackend; use crate::local_backend::LocalBackend;
use crate::local_working_copy::LocalWorkingCopy; use crate::local_working_copy::LocalWorkingCopy;
use crate::op_store::{OperationId, WorkspaceId}; use crate::op_store::{OperationId, WorkspaceId};
@ -204,15 +204,17 @@ impl Workspace {
// TODO: Clean up path normalization. store_path is canonicalized by // TODO: Clean up path normalization. store_path is canonicalized by
// ReadonlyRepo::init(). workspace_root will be canonicalized by // ReadonlyRepo::init(). workspace_root will be canonicalized by
// Workspace::new(), but it's not yet here. // Workspace::new(), but it's not yet here.
let store_relative_git_repo_path = let store_relative_git_repo_path = match (
match (workspace_root.canonicalize(), git_repo_path.canonicalize()) { workspace_root.canonicalize(),
(Ok(workspace_root), Ok(git_repo_path)) canonicalize_git_repo_path(git_repo_path),
if git_repo_path.starts_with(&workspace_root) => ) {
{ (Ok(workspace_root), Ok(git_repo_path))
file_util::relative_path(store_path, &git_repo_path) if git_repo_path.starts_with(&workspace_root) =>
} {
_ => git_repo_path.to_owned(), file_util::relative_path(store_path, &git_repo_path)
}; }
_ => git_repo_path.to_owned(),
};
let backend = let backend =
GitBackend::init_external(settings, store_path, &store_relative_git_repo_path)?; GitBackend::init_external(settings, store_path, &store_relative_git_repo_path)?;
Ok(Box::new(backend)) Ok(Box::new(backend))