Skip to content

fix: resolve --file paths from subdirectories #2910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lawrence3699 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: resolve --file paths from subdirectories #2910

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 127 additions & 8 deletions src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ use ratatui::{
};
use std::{
cell::{Cell, RefCell},
env,
path::{Path, PathBuf},
rc::Rc,
};
Expand Down Expand Up @@ -178,14 +179,10 @@ impl App {

let mut select_file: Option<PathBuf> = None;
let tab = if let Some(file) = cliargs.select_file {
// convert to relative git path
if let Ok(abs) = file.canonicalize() {
if let Ok(path) = abs.strip_prefix(
env.repo.borrow().gitpath().canonicalize()?,
) {
select_file = Some(Path::new(".").join(path));
}
}
select_file = resolve_initial_select_file(
file.as_path(),
&env.repo.borrow(),
);
2
} else {
env.options.borrow().current_tab()
Expand Down Expand Up @@ -490,6 +487,48 @@ impl App {
}
}

fn resolve_initial_select_file(
file: &Path,
repo_path: &RepoPath,
) -> Option<PathBuf> {
resolve_initial_select_file_from_cwd(
file,
repo_path,
&env::current_dir().ok()?,
)
}

fn resolve_initial_select_file_from_cwd(
file: &Path,
repo_path: &RepoPath,
cwd: &Path,
) -> Option<PathBuf> {
let repo_root = PathBuf::from(repo_work_dir(repo_path).ok()?)
.canonicalize()
.ok()?;
let cwd = cwd.canonicalize().ok()?;
let mut candidates = Vec::new();

if file.is_absolute() {
candidates.push(file.to_path_buf());
} else {
candidates.push(cwd.join(file));
if cwd != repo_root {
candidates.push(repo_root.join(file));
}
}

for candidate in candidates {
if let Ok(abs) = candidate.canonicalize() {
if let Ok(path) = abs.strip_prefix(&repo_root) {
return Some(Path::new(".").join(path));
}
}
}

None
}

// private impls
impl App {
accessors!(
Expand Down Expand Up @@ -1227,3 +1266,83 @@ impl App {
);
}
}

#[cfg(test)]
mod tests {
use super::{resolve_initial_select_file_from_cwd, RepoPath};
use std::{fs, path::Path, process::Command};
use tempfile::TempDir;

fn make_repo_with_nested_file() -> (TempDir, RepoPath) {
let temp_dir = TempDir::new().expect("create temp repo");
let status = Command::new("git")
.arg("init")
.arg("-q")
.arg(temp_dir.path())
.status()
.expect("run git init");
assert!(status.success(), "git init should succeed");
Comment on lines +1273 to +1284
Copy link

Copilot AI Apr 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new unit tests spawn the git binary (Command::new("git")) to initialize a repo. If the project tries to keep unit tests runnable without requiring an external git executable on PATH, consider using the existing git2-testing helper (used in src/gitui.rs tests) or git2::Repository::init instead.

Suggested change
use std::{fs, path::Path, process::Command};
use tempfile::TempDir;
fn make_repo_with_nested_file() -> (TempDir, RepoPath) {
let temp_dir = TempDir::new().expect("create temp repo");
let status = Command::new("git")
.arg("init")
.arg("-q")
.arg(temp_dir.path())
.status()
.expect("run git init");
assert!(status.success(), "git init should succeed");
use std::{fs, path::Path};
use tempfile::TempDir;
fn make_repo_with_nested_file() -> (TempDir, RepoPath) {
let temp_dir = TempDir::new().expect("create temp repo");
git2::Repository::init(temp_dir.path())
.expect("initialize git repository");

Copilot uses AI. Check for mistakes.

let nested_dir = temp_dir.path().join("frontend/src");
fs::create_dir_all(&nested_dir)
.expect("create nested frontend/src directory");
fs::write(nested_dir.join("index.html"), "<html>\n")
.expect("write nested test file");
let repo_path: RepoPath = temp_dir
.path()
.to_str()
.expect("temp path should be utf-8")
.into();
(temp_dir, repo_path)
}

#[test]
fn resolve_initial_select_file_from_repo_root() {
let (temp_dir, repo_path) = make_repo_with_nested_file();

let selected = resolve_initial_select_file_from_cwd(
Path::new("frontend/src/index.html"),
&repo_path,
temp_dir.path(),
);

assert_eq!(
selected,
Some(Path::new(".").join("frontend/src/index.html"))
);
}

#[test]
fn resolve_initial_select_file_from_subdir_cwd_relative_path() {
let (temp_dir, repo_path) = make_repo_with_nested_file();
let cwd = temp_dir.path().join("frontend");

let selected = resolve_initial_select_file_from_cwd(
Path::new("src/index.html"),
&repo_path,
&cwd,
);

assert_eq!(
selected,
Some(Path::new(".").join("frontend/src/index.html"))
);
}

#[test]
fn resolve_initial_select_file_from_subdir_repo_relative_path() {
let (temp_dir, repo_path) = make_repo_with_nested_file();
let cwd = temp_dir.path().join("frontend");

let selected = resolve_initial_select_file_from_cwd(
Path::new("frontend/src/index.html"),
&repo_path,
&cwd,
);

assert_eq!(
selected,
Some(Path::new(".").join("frontend/src/index.html"))
);
}
}
Loading