Skip to content
Merged
Changes from 1 commit
Commits
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
28 changes: 28 additions & 0 deletions src/repo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2043,6 +2043,20 @@ impl Repository {
}

/// Test if the ignore rules apply to a given path.
#[cfg(windows)]
Copy link
Member

Choose a reason for hiding this comment

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

Instead of #[cfg], could if cfg!(windows) be used to conditionally do the to_string_lossy instead?

pub fn is_path_ignored<P: AsRef<Path>>(&self, path: P) -> Result<bool, Error> {
// `git_ignore_path_is_ignored` dose not work with windows path separator
// so we convert \ to /
let path = try!(::std::ffi::CString::new(path.as_ref().to_string_lossy().replace('\\', "/")));
let mut ignored: c_int = 0;
unsafe {
try_call!(raw::git_ignore_path_is_ignored(&mut ignored, self.raw, path));
}
Ok(ignored == 1)
}

/// Test if the ignore rules apply to a given path.
#[cfg(not(windows))]
pub fn is_path_ignored<P: AsRef<Path>>(&self, path: P) -> Result<bool, Error> {
let path = try!(path.as_ref().into_c_string());
let mut ignored: c_int = 0;
Expand Down Expand Up @@ -2540,4 +2554,18 @@ mod tests {
let _ = repo.clear_ignore_rules();
assert!(!repo.is_path_ignored(Path::new("/foo")).unwrap());
}

#[test]
#[cfg(windows)]
Copy link
Member

Choose a reason for hiding this comment

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

Could the be listed below with an if cfg!(windows) guard instead?

fn windows_is_path_ignored() {
let (_td, repo) = graph_repo_init();

assert!(!repo.is_path_ignored(Path::new("/foo")).unwrap());

let _ = repo.add_ignore_rule("/foo");
assert!(repo.is_path_ignored(Path::new("\\foo\\thing")).unwrap());

let _ = repo.clear_ignore_rules();
assert!(!repo.is_path_ignored(Path::new("\\foo\\thing")).unwrap());
}
}