Move include files to include/git/, drop git_ prefix from file names

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

9 files changed, 4 insertions, 497 deletions

diff --git a/src/git_commit.c b/src/commit.c
index 5e98d798..1a039633 100644
--- a/src/git_commit.c
+++ b/src/commit.c
@@ -33,7 +33,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "git_commit.h"
+#include "git/commit.h"
 
 const git_oid *git_commit_id(git_commit *c)
 {
diff --git a/src/git_commit.h b/src/git_commit.h
deleted file mode 100644
index 3864bcd2..00000000
--- a/src/git_commit.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following
- *   disclaimer in the documentation and/or other materials provided
- *   with the distribution.
- *
- * - Neither the name of the Git Development Community nor the
- *   names of its contributors may be used to endorse or promote
- *   products derived from this software without specific prior
- *   written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef INCLUDE_git_commit_h__
-#define INCLUDE_git_commit_h__
-
-#include "git_common.h"
-#include "git_oid.h"
-#include <time.h>
-
-/**
- * @file git_commit.h
- * @brief Git commit parsing, formatting routines
- * @defgroup git_commit Git commit parsing, formatting routines
- * @ingroup Git
- * @{
- */
-GIT_BEGIN_DECL
-
-/** Parsed representation of a commit object. */
-typedef struct git_commit git_commit;
-#ifdef GIT__PRIVATE
-struct git_commit {
-	git_oid id;
-	time_t commit_time;
-	unsigned parsed:1,
-	         flags:26;
-};
-#endif
-
-/**
- * Parse (or lookup) a commit from a revision pool.
- * @param pool the pool to use when parsing/caching the commit.
- * @param id identity of the commit to locate.  If the object is
- *        an annotated tag it will be peeled back to the commit.
- * @return the commit; NULL if the commit does not exist in the
- *         pool's git_odb, or if the commit is present but is
- *         too malformed to be parsed successfully.
- */
-GIT_EXTERN(git_commit*) git_commit_parse(git_revp *pool, const git_oid *id);
-
-/**
- * Get the id of a commit.
- * @param commit a previously parsed commit.
- * @return object identity for the commit.
- */
-GIT_EXTERN(const git_oid*) git_commit_id(git_commit *commit);
-
-/** @} */
-GIT_END_DECL
-#endif
diff --git a/src/git_common.h b/src/git_common.h
deleted file mode 100644
index c9c7b0e1..00000000
--- a/src/git_common.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following
- *   disclaimer in the documentation and/or other materials provided
- *   with the distribution.
- *
- * - Neither the name of the Git Development Community nor the
- *   names of its contributors may be used to endorse or promote
- *   products derived from this software without specific prior
- *   written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef INCLUDE_git_common_h__
-#define INCLUDE_git_common_h__
-
-#ifdef __cplusplus
-# define GIT_BEGIN_DECL  extern "C" {
-# define GIT_END_DECL    }
-#else
-  /** Start declarations in C mode */
-# define GIT_BEGIN_DECL  /* empty */
-  /** End declarations in C mode */
-# define GIT_END_DECL    /* empty */
-#endif
-
-/**
- * @file git_common.h
- * @brief Git common platform definitions
- * @defgroup git_common Git common platform definitions
- * @ingroup Git
- * @{
- */
-GIT_BEGIN_DECL
-
-/** Declare a public function exported for application use. */
-#ifdef __GNUC__
-# define GIT_EXTERN(type) __attribute__((visibility("default"))) type
-#else
-# define GIT_EXTERN(type) type
-#endif
-
-/** Operation completed successfully. */
-#define GIT_SUCCESS 0
-
-/**
- * Operation failed, with unspecified reason.
- * This value also serves as the base error code; all other
- * error codes are subtracted from it such that all errors
- * are < 0, in typical POSIX C tradition.
- */
-#define GIT_ERROR -1
-
-/** Input was not a properly formatted Git object id. */
-#define GIT_ENOTOID (GIT_ERROR - 1)
-
-/** Input does not exist in the scope searched. */
-#define GIT_ENOTFOUND (GIT_ERROR - 2)
-
-/** A revision traversal pool. */
-typedef struct git_revp git_revp;
-
-/** @} */
-GIT_END_DECL
-#endif
diff --git a/src/git_odb.h b/src/git_odb.h
deleted file mode 100644
index 5069c192..00000000
--- a/src/git_odb.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following
- *   disclaimer in the documentation and/or other materials provided
- *   with the distribution.
- *
- * - Neither the name of the Git Development Community nor the
- *   names of its contributors may be used to endorse or promote
- *   products derived from this software without specific prior
- *   written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef INCLUDE_git_odb_h__
-#define INCLUDE_git_odb_h__
-
-#include "git_common.h"
-#include "git_oid.h"
-#include <unistd.h>
-
-/**
- * @file git_odb.h
- * @brief Git object database routines
- * @defgroup git_odb Git object database routines
- * @ingroup Git
- * @{
- */
-GIT_BEGIN_DECL
-
-/** An open object database handle. */
-typedef struct git_odb git_odb;
-
-/**
- * Open an object database for read/write access.
- * @param out location to store the database pointer, if opened.
- *            Set to NULL if the open failed.
- * @param objects_dir path of the database's "objects" directory.
- * @return GIT_SUCCESS if the database opened; otherwise an error
- *         code describing why the open was not possible.
- */
-GIT_EXTERN(int) git_odb_open(git_odb **out, const char *objects_dir);
-
-/**
- * Close an open object database.
- * @param db database pointer to close.  If NULL no action is taken.
- *           The pointer is set to NULL when the close is completed.
- */
-GIT_EXTERN(void) git_odb_close(git_odb **db);
-
-/** Basic type (loose or packed) of any Git object. */
-typedef enum {
-	GIT_OBJ_BAD = -1,       /**< Object is invalid. */
-	GIT_OBJ__EXT1 = 0,      /**< Reserved for future use. */
-	GIT_OBJ_COMMIT = 1,     /**< A commit object. */
-	GIT_OBJ_TREE = 2,       /**< A tree (directory listing) object. */
-	GIT_OBJ_BLOB = 3,       /**< A file revision object. */
-	GIT_OBJ_TAG = 4,        /**< An annotated tag object. */
-	GIT_OBJ__EXT2 = 5,      /**< Reserved for future use. */
-	GIT_OBJ_OFS_DELTA = 6,  /**< A delta, base is given by an offset. */
-	GIT_OBJ_REF_DELTA = 7,  /**< A delta, base is given by object id. */
-} git_otype;
-
-/** A small object read from the database. */
-typedef struct {
-	void *data;            /**< Raw, decompressed object data. */
-	size_t len  ;          /**< Total number of bytes in data. */
-	git_otype type;      /**< Type of this object. */
-} git_sobj;
-
-/**
- * Read a small object from the database.
- *
- * If GIT_ENOTFOUND then out->data is set to NULL.
- *
- * @param out object descriptor to populate upon reading.
- * @param db database to search for the object in.
- * @param id identity of the object to read.
- * @return
- * - GIT_SUCCESS if the object was read;
- * - GIT_ENOTFOUND if the object is not in the database.
- */
-GIT_EXTERN(int) git_odb_read(git_sobj *out, git_odb *db, const git_oid *id);
-
-/**
- * Read a small object from the database using only pack files.
- *
- * If GIT_ENOTFOUND then out->data is set to NULL.
- *
- * @param out object descriptor to populate upon reading.
- * @param db database to search for the object in.
- * @param id identity of the object to read.
- * @return
- * - GIT_SUCCESS if the object was read.
- * - GIT_ENOTFOUND if the object is not in the database.
- */
-GIT_EXTERN(int) git_odb__read_packed(git_sobj *out, git_odb *db, const git_oid *id);
-
-/**
- * Read a small object from the database using only loose object files.
- *
- * If GIT_ENOTFOUND then out->data is set to NULL.
- *
- * @param out object descriptor to populate upon reading.
- * @param db database to search for the object in.
- * @param id identity of the object to read.
- * @return
- * - GIT_SUCCESS if the object was read.
- * - GIT_ENOTFOUND if the object is not in the database.
- */
-GIT_EXTERN(int) git_odb__read_loose(git_sobj *out, git_odb *db, const git_oid *id);
-
-/**
- * Release all memory used by the sobj structure.
- *
- * As a result of this call, obj->data will be set to NULL.
- *
- * If obj->data is already NULL, nothing happens.
- *
- * @param obj object descriptor to free.
- */
-GIT_EXTERN(void) git_sobj_close(git_sobj *obj);
-
-/** @} */
-GIT_END_DECL
-#endif
diff --git a/src/git_oid.h b/src/git_oid.h
deleted file mode 100644
index a24f1bb1..00000000
--- a/src/git_oid.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following
- *   disclaimer in the documentation and/or other materials provided
- *   with the distribution.
- *
- * - Neither the name of the Git Development Community nor the
- *   names of its contributors may be used to endorse or promote
- *   products derived from this software without specific prior
- *   written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef INCLUDE_git_oid_h__
-#define INCLUDE_git_oid_h__
-
-#include "git_common.h"
-
-/**
- * @file git_oid.h
- * @brief Git object id routines
- * @defgroup git_oid Git object id routines
- * @ingroup Git
- * @{
- */
-GIT_BEGIN_DECL
-
-/** Unique identity of any object (commit, tree, blob, tag). */
-typedef struct
-{
-	/** raw binary formatted id */
-	unsigned char id[20];
-} git_oid;
-
-/**
- * Parse a hex formatted object id into a git_oid.
- * @param out oid structure the result is written into.
- * @param str input hex string; must be pointing at the start of
- *        the hex sequence and have at least the number of bytes
- *        needed for an oid encoded in hex (40 bytes).
- * @return GIT_SUCCESS if valid; GIT_ENOTOID on failure.
- */
-GIT_EXTERN(int) git_oid_mkstr(git_oid *out, const char *str);
-
-/**
- * Copy an already raw oid into a git_oid structure.
- * @param out oid structure the result is written into.
- * @param raw the raw input bytes to be copied.
- */
-GIT_EXTERN(void) git_oid_mkraw(git_oid *out, const unsigned char *raw);
-
-/** @} */
-GIT_END_DECL
-#endif
diff --git a/src/git_revwalk.h b/src/git_revwalk.h
deleted file mode 100644
index d0e7959d..00000000
--- a/src/git_revwalk.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following
- *   disclaimer in the documentation and/or other materials provided
- *   with the distribution.
- *
- * - Neither the name of the Git Development Community nor the
- *   names of its contributors may be used to endorse or promote
- *   products derived from this software without specific prior
- *   written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef INCLUDE_git_revwalk_h__
-#define INCLUDE_git_revwalk_h__
-
-#include "git_common.h"
-#include "git_odb.h"
-#include "git_commit.h"
-
-/**
- * @file git_revwalk.h
- * @brief Git revision traversal routines
- * @defgroup git_revwalk Git revision traversal routines
- * @ingroup Git
- * @{
- */
-GIT_BEGIN_DECL
-
-/**
- * Allocate a new revision traversal pool.
- *
- * The configuration is copied during allocation.  Changes
- * to the configuration after allocation do not affect the pool
- * returned by this function.  Callers may safely free the
- * passed configuration after the function completes.
- *
- * @param db the database objects are read from.
- * @return the new traversal handle; NULL if memory is exhausted.
- */
-GIT_EXTERN(git_revp*) git_revp_alloc(git_odb *db);
-
-/**
- * Reset the traversal machinary for reuse.
- * @param pool traversal handle to reset.
- */
-GIT_EXTERN(void) git_revp_reset(git_revp *pool);
-
-/**
- * Mark an object to start traversal from.
- * @param pool the pool being used for the traversal.
- * @param commit the commit the commit to start from.
- */
-GIT_EXTERN(void) git_revp_pushc(git_revp *pool, git_commit *commit);
-
-/**
- * Mark a commit (and its ancestors) uninteresting for the output.
- * @param pool the pool being used for the traversal.
- * @param commit the commit the commit to start from.
- */
-GIT_EXTERN(void) git_revp_hidec(git_revp *pool, git_commit *commit);
-
-/**
- * Get the next commit from the revision traversal.
- * @param pool the pool to pop the commit from.
- * @return next commit; NULL if there is no more output.
- */
-GIT_EXTERN(git_commit*) git_revp_nextc(git_revp *pool);
-
-/**
- * Free a revwalk previously allocated.
- * @param pool traversal handle to close.  If NULL nothing occurs.
- */
-GIT_EXTERN(void) git_revp_free(git_revp *pool);
-
-/** @} */
-GIT_END_DECL
-#endif
diff --git a/src/git_odb.c b/src/odb.c
index a9206339..cb98feca 100644
--- a/src/git_odb.c
+++ b/src/odb.c
@@ -33,7 +33,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "git_odb.h"
+#include "git/odb.h"
 
 struct git_odb {
 	/** Path to the "objects" directory. */
diff --git a/src/git_oid.c b/src/oid.c
index 20d191c8..f15b7503 100644
--- a/src/git_oid.c
+++ b/src/oid.c
@@ -33,7 +33,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "git_oid.h"
+#include "git/oid.h"
 #include <string.h>
 
 static signed char from_hex[] = {
diff --git a/src/git_revwalk.c b/src/revwalk.c
index 898dabc7..4801a238 100644
--- a/src/git_revwalk.c
+++ b/src/revwalk.c
@@ -33,7 +33,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "git_revwalk.h"
+#include "git/revwalk.h"
 #include <stdlib.h>
 
 struct git_revp {