Bind pathspec functions

Author: alexcrichton

libgit2-sys/lib.rs

@@ -63,6 +63,9 @@ pub enum git_push {}
 pub enum git_note {}
 pub enum git_note_iterator {}
 pub enum git_status_list {}
+pub enum git_pathspec {}
+pub enum git_pathspec_match_list {}
+pub enum git_diff {}
 
 #[repr(C)]
 pub struct git_revspec {
@@ -692,6 +695,15 @@ pub struct git_remote_head {
     pub symref_target: *mut c_char,
 }
 
+pub type git_pathspec_flag_t = u32;
+pub const GIT_PATHSPEC_DEFAULT: u32 = 0;
+pub const GIT_PATHSPEC_IGNORE_CASE: u32 = 1 << 0;
+pub const GIT_PATHSPEC_USE_CASE: u32 = 1 << 1;
+pub const GIT_PATHSPEC_NO_GLOB: u32 = 1 << 2;
+pub const GIT_PATHSPEC_NO_MATCH_ERROR: u32 = 1 << 3;
+pub const GIT_PATHSPEC_FIND_FAILURES: u32 = 1 << 4;
+pub const GIT_PATHSPEC_FAILURES_ONLY: u32 = 1 << 5;
+
 /// Initialize openssl for the libgit2 library
 #[cfg(unix)]
 pub fn openssl_init() {
@@ -1583,6 +1595,41 @@ extern {
                           repo: *mut git_repository,
                           one: *const git_oid,
                           two: *const git_oid) -> c_int;
+
+    // pathspec
+    pub fn git_pathspec_free(ps: *mut git_pathspec);
+    pub fn git_pathspec_match_diff(out: *mut *mut git_pathspec_match_list,
+                                   diff: *mut git_diff,
+                                   flags: u32,
+                                   ps: *mut git_pathspec) -> c_int;
+    pub fn git_pathspec_match_index(out: *mut *mut git_pathspec_match_list,
+                                    index: *mut git_index,
+                                    flags: u32,
+                                    ps: *mut git_pathspec) -> c_int;
+    pub fn git_pathspec_match_list_diff_entry(m: *const git_pathspec_match_list,
+                                              pos: size_t) -> *const git_diff_delta;
+    pub fn git_pathspec_match_list_entry(m: *const git_pathspec_match_list,
+                                         pos: size_t) -> *const c_char;
+    pub fn git_pathspec_match_list_entrycount(m: *const git_pathspec_match_list)
+                                              -> size_t;
+    pub fn git_pathspec_match_list_failed_entry(m: *const git_pathspec_match_list,
+                                                pos: size_t) -> *const c_char;
+    pub fn git_pathspec_match_list_failed_entrycount(
+                    m: *const git_pathspec_match_list) -> size_t;
+    pub fn git_pathspec_match_list_free(m: *const git_pathspec_match_list);
+    pub fn git_pathspec_match_tree(out: *mut *mut git_pathspec_match_list,
+                                   tree: *mut git_tree,
+                                   flags: u32,
+                                   ps: *mut git_pathspec) -> c_int;
+    pub fn git_pathspec_match_workdir(out: *mut *mut git_pathspec_match_list,
+                                      repo: *mut git_repository,
+                                      flags: u32,
+                                      ps: *mut git_pathspec) -> c_int;
+    pub fn git_pathspec_matches_path(ps: *const git_pathspec,
+                                     flags: u32,
+                                     path: *const c_char) -> c_int;
+    pub fn git_pathspec_new(out: *mut *mut git_pathspec,
+                            pathspec: *const git_strarray) -> c_int;
 }
 
 #[test]

src/diff.rs

@@ -1,6 +1,6 @@
 use std::kinds::marker;
 
-use {raw, StatusEntry, Delta, Oid};
+use {raw, Delta, Oid};
 
 /// Description of changes to one entry.
 pub struct DiffDelta<'a> {
@@ -27,8 +27,7 @@ impl<'a> DiffDelta<'a> {
     ///
     /// This method is unsafe as there is no guarantee that `raw` is a valid
     /// pointer.
-    pub unsafe fn from_raw(_entry: &StatusEntry<'a>,
-                           raw: *mut raw::git_diff_delta) -> DiffDelta<'a> {
+    pub unsafe fn from_raw(raw: *mut raw::git_diff_delta) -> DiffDelta<'a> {
         DiffDelta {
             raw: raw,
             marker1: marker::ContravariantLifetime,

src/lib.rs

@@ -90,6 +90,8 @@ pub use index::{Index, IndexEntry, IndexEntries, IndexMatchedPath};
 pub use note::{Note, Notes};
 pub use object::Object;
 pub use oid::Oid;
+pub use pathspec::{Pathspec, PathspecMatchList, PathspecFailedEntries};
+pub use pathspec::{PathspecDiffEntries, PathspecEntries};
 pub use push::{Push, PushStatus};
 pub use reference::{Reference, References, ReferenceNames};
 pub use refspec::Refspec;
@@ -288,6 +290,7 @@ mod index;
 mod note;
 mod object;
 mod oid;
+mod pathspec;
 mod push;
 mod reference;
 mod refspec;
@@ -533,6 +536,20 @@ Lastly, the following will only be returned for ignore "NONE".
 
 }
 
+bitflags! {
+    #[doc = r#"
+"#]
+    flags PathspecFlags: u32 {
+        const PATHSPEC_DEFAULT = raw::GIT_PATHSPEC_DEFAULT as u32,
+        const PATHSPEC_IGNORE_CASE = raw::GIT_PATHSPEC_IGNORE_CASE as u32,
+        const PATHSPEC_USE_CASE = raw::GIT_PATHSPEC_USE_CASE as u32,
+        const PATHSPEC_NO_GLOB = raw::GIT_PATHSPEC_NO_GLOB as u32,
+        const PATHSPEC_NO_MATCH_ERROR = raw::GIT_PATHSPEC_NO_MATCH_ERROR as u32,
+        const PATHSPEC_FIND_FAILURES = raw::GIT_PATHSPEC_FIND_FAILURES as u32,
+        const PATHSPEC_FAILURES_ONLY = raw::GIT_PATHSPEC_FAILURES_ONLY as u32,
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::ObjectType;