Update to 1.6.4

Author: todaysoftware

src/git2/common.inc

@@ -18,11 +18,6 @@ const
    *)
 
   GIT_PATH_MAX                = 4096;
-  (**
-   * The string representation of the null object ID.
-   *)
-
-  GIT_OID_HEX_ZERO            = '0000000000000000000000000000000000000000';
 
   (**
    * Return the version of the libgit2 library
@@ -148,6 +143,8 @@ const
   GIT_OPT_SET_EXTENSIONS      = 34;
   GIT_OPT_GET_OWNER_VALIDATION = 35;
   GIT_OPT_SET_OWNER_VALIDATION = 36;
+  GIT_OPT_GET_HOMEDIR         = 37;
+  GIT_OPT_SET_HOMEDIR         = 38;
 type
   git_libgit2_opt_t = Integer;
 
@@ -395,6 +392,16 @@ type
    *      > Set that repository directories should be owned by the current
    *      > user. The default is to validate ownership.
    *
+   *   opts(GIT_OPT_GET_HOMEDIR, git_buf *out)
+   *      > Gets the current user's home directory, as it will be used
+   *      > for file lookups. The path is written to the `out` buffer.
+   *
+   *   opts(GIT_OPT_SET_HOMEDIR, const char *path)
+   *      > Sets the directory used as the current user's home directory,
+   *      > for file lookups.
+   *      >
+   *      > - `path` directory of home directory.
+   *
    * @param option Option key
    * @param ... value to set the option
    * @return 0 on success, <0 on failure

src/git2/diff.inc

@@ -234,7 +234,7 @@ type
     mode: uint16_t;
     (**
      * Represents the known length of the `id` field, when
-     * converted to a hex string.  It is generally `GIT_OID_HEXSZ`, unless this
+  	 * converted to a hex string.  It is generally `GIT_OID_SHA1_HEXSIZE`, unless this
      * delta was created from reading a patch file, in which case it may be
      * abbreviated to something reasonable, like 7 characters.
      *)

src/git2/indexer.inc

@@ -51,6 +51,17 @@ type
 type
   git_indexer_options = record
     version: Cardinal;
+    {$IFDEF GIT_EXPERIMENTAL_SHA256}
+    (** permissions to use creating packfile or 0 for defaults *)
+    mode: Cardinal;
+    (**
+     * object database from which to read base objects when
+     * fixing thin packs. This can be NULL if there are no thin
+     * packs; if a thin pack is encountered, an error will be
+     * returned if there are bases missing.
+     *)
+    odb: Pgit_odb;
+    {$ENDIF}
     (** progress_cb function to call with progress information  *)
     progress_cb: git_indexer_progress_cb;
     (** progress_cb_payload payload for the progress callback  *)
@@ -74,6 +85,10 @@ const
 
 function git_indexer_options_init(opts: Pgit_indexer_options; version: Cardinal): Integer; cdecl; external libgit2_dll;
 
+{$IFDEF GIT_EXPERIMENTAL_SHA256}
+function git_indexer_new(out_: PPgit_indexer; path: PAnsiChar; oid_type: git_oid_t;
+  opts: Pgit_indexer_options): Integer; cdecl; external libgit2_dll;
+{$ELSE}
 (**
  * Create a new indexer instance
  *
@@ -90,6 +105,7 @@ function git_indexer_options_init(opts: Pgit_indexer_options; version: Cardinal)
 
 function git_indexer_new(out_: PPgit_indexer; path: PAnsiChar; mode: Cardinal; odb: Pgit_odb;
   opts: Pgit_indexer_options): Integer; cdecl; external libgit2_dll;
+{$ENDIF}
 
 (**
  * Add data to the indexer

src/git2/object.inc

@@ -210,6 +210,7 @@ function git_object_peel(peeled: PPgit_object; object_: Pgit_object;
 
 function git_object_dup(dest: PPgit_object; source: Pgit_object): Integer; cdecl; external libgit2_dll;
 
+{$IFDEF GIT_EXPERIMENTAL_SHA256}
 (**
  * Analyzes a buffer of raw object content and determines its validity.
  * Tree, commit, and tag objects will be parsed and ensured that they
@@ -223,14 +224,34 @@ function git_object_dup(dest: PPgit_object; source: Pgit_object): Integer; cdecl
  * @param valid Output pointer to set with validity of the object content
  * @param buf The contents to validate
  * @param len The length of the buffer
- * @param type The type of the object in the buffer
+ * @param object_type The type of the object in the buffer
+ * @param oid_type The object ID type for the OIDs in the given buffer
  * @return 0 on success or an error code
  *)
 
+function git_object_rawcontent_is_valid(valid: PInteger; buf: PAnsiChar; len: size_t;
+  type_: git_object_t; oid_type: git_oid_t): Integer; cdecl; external libgit2_dll;
+
+{$ELSE}
+(**
+ * Analyzes a buffer of raw object content and determines its validity.
+ * Tree, commit, and tag objects will be parsed and ensured that they
+ * are valid, parseable content.  (Blobs are always valid by definition.)
+ * An error message will be set with an informative message if the object
+ * is not valid.
+ *
+ * @warning This function is experimental and its signature may change in
+ * the future.
+ *
+ * @param valid Output pointer to set with validity of the object content
+ * @param buf The contents to validate
+ * @param len The length of the buffer
+ * @param object_type The type of the object in the buffer
+ * @return 0 on success or an error code
+ *)
 function git_object_rawcontent_is_valid(valid: PInteger; buf: PAnsiChar; len: size_t;
   type_: git_object_t): Integer; cdecl; external libgit2_dll;
+{$ENDIF}
 
 (** @}  *)
 
-
-

src/git2/odb.inc

@@ -23,18 +23,45 @@ const
 type
   git_odb_foreach_cb = function(id: Pgit_oid; payload: Pointer): Integer; cdecl;
 
+  (** Options for configuring a loose object backend. *)
+  git_odb_options = record
+    version: cardinal; (**< version for the struct *)
+
+    (**
+     * Type of object IDs to use for this object database, or
+     * 0 for default (currently SHA1).
+     *)
+    oid_type: git_oid_t;
+  end;
+  Pgit_odb_options = ^git_odb_options;
+
+const
+  (* The current version of the diff options structure *)
+  GIT_ODB_OPTIONS_VERSION     = 1;
+
+  (* Stack initializer for odb options.  Alternatively use
+   * `git_odb_options_init` programmatic initialization.
+   *)
+  //#define GIT_ODB_OPTIONS_INIT { GIT_ODB_OPTIONS_VERSION }
+
   (**
- * Create a new object database with no backends.
- *
- * Before the ODB can be used for read/writing, a custom database
- * backend must be manually added using `git_odb_add_backend()`
- *
- * @param out location to store the database pointer, if opened.
- *			Set to NULL if the open failed.
- * @return 0 or an error code
- *)
+   * Create a new object database with no backends.
+   *
+   * Before the ODB can be used for read/writing, a custom database
+   * backend must be manually added using `git_odb_add_backend()`
+   *
+   * @param out location to store the database pointer, if opened.
+   *			Set to NULL if the open failed.
+   * @param opts the options for this object database or NULL for defaults
+   * @return 0 or an error code
+   *)
+
+  {$IFDEF GIT_EXPERIMENTAL_SHA256}
+function git_odb_new(out_: PPgit_odb; opts: Pgit_odb_options): Integer; cdecl; external libgit2_dll;
 
+{$ELSE}
 function git_odb_new(out_: PPgit_odb): Integer; cdecl; external libgit2_dll;
+{$ENDIF}
 
 (**
  * Create a new object database and automatically add
@@ -50,11 +77,16 @@ function git_odb_new(out_: PPgit_odb): Integer; cdecl; external libgit2_dll;
  * @param out location to store the database pointer, if opened.
  *			Set to NULL if the open failed.
  * @param objects_dir path of the backends' "objects" directory.
+ * @param opts the options for this object database or NULL for defaults
  * @return 0 or an error code
  *)
 
-function git_odb_open(out_: PPgit_odb; objects_dir: PAnsiChar): Integer; cdecl; external libgit2_dll;
+{$IFDEF GIT_EXPERIMENTAL_SHA256}
+function git_odb_open(out_: PPgit_odb; objects_dir: PAnsiChar; opts: Pgit_odb_options): Integer; cdecl; external libgit2_dll;
 
+{$ELSE}
+function git_odb_open(out_: PPgit_odb; objects_dir: PAnsiChar): Integer; cdecl; external libgit2_dll;
+{$ENDIF}
 (**
  * Add an on-disk alternate to an existing Object DB.
  *
@@ -107,7 +139,7 @@ function git_odb_read(out_: PPgit_odb_object; db: Pgit_odb; id: Pgit_oid): Integ
  * This method queries all available ODB backends
  * trying to match the 'len' first hexadecimal
  * characters of the 'short_id'.
- * The remaining (GIT_OID_HEXSZ-len)*4 bits of
+ * The remaining (GIT_OID_SHA1_HEXSIZE-len)*4 bits of
  * 'short_id' must be 0s.
  * 'len' must be at least GIT_OID_MINPREFIXLEN,
  * and the prefix must be long enough to identify
@@ -217,7 +249,7 @@ type
    *
    * The given array will be updated in place: for each abbreviated ID that is
    * unique in the database, and of the given type (if specified),
-   * the full object ID, object ID length (`GIT_OID_HEXSZ`) and type will be
+   * the full object ID, object ID length (`GIT_OID_SHA1_HEXSIZE`) and type will be
    * written back to the array. For IDs that are not found (or are ambiguous),
    * the array entry will be zeroed.
    *
@@ -440,19 +472,26 @@ function git_odb_write_pack(out_: PPgit_odb_writepack; db: Pgit_odb; progress_cb
 function git_odb_write_multi_pack_index(db: Pgit_odb): Integer; cdecl; external libgit2_dll;
 
 (**
- * Determine the object-ID (sha1 hash) of a data buffer
+ * Determine the object-ID (sha1 or sha256 hash) of a data buffer
  *
- * The resulting SHA-1 OID will be the identifier for the data
- * buffer as if the data buffer it were to written to the ODB.
+ * The resulting OID will be the identifier for the data buffer as if
+ * the data buffer it were to written to the ODB.
  *
  * @param out the resulting object-ID.
  * @param data data to hash
  * @param len size of the data
- * @param type of the data to hash
+ * @param object_type of the data to hash
+ * @param oid_type the oid type to hash to
  * @return 0 or an error code
  *)
 
+{$IFDEF GIT_EXPERIMENTAL_SHA256}
+function git_odb_hash(out_: Pgit_oid; data: Pointer; len: size_t; type_: git_object_t;
+  oid_type: git_oid_t): Integer; cdecl; external libgit2_dll;
+
+{$ELSE}
 function git_odb_hash(out_: Pgit_oid; data: Pointer; len: size_t; type_: git_object_t): Integer; cdecl; external libgit2_dll;
+{$ENDIF}
 
 (**
  * Read a file from disk and fill a git_oid with the object id
@@ -464,11 +503,18 @@ function git_odb_hash(out_: Pgit_oid; data: Pointer; len: size_t; type_: git_obj
  *
  * @param out oid structure the result is written into.
  * @param path file to read and determine object id for
- * @param type the type of the object that will be hashed
+ * @param object_type of the data to hash
+ * @param oid_type the oid type to hash to
  * @return 0 or an error code
  *)
 
+{$IFDEF GIT_EXPERIMENTAL_SHA256}
+function git_odb_hashfile(out_: Pgit_oid; path: PAnsiChar; type_: git_object_t;
+  oid_type: git_oid_t): Integer; cdecl; external libgit2_dll;
+
+{$ELSE}
 function git_odb_hashfile(out_: Pgit_oid; path: PAnsiChar; type_: git_object_t): Integer; cdecl; external libgit2_dll;
+{$ENDIF}
 
 (**
  * Create a copy of an odb_object
@@ -618,5 +664,3 @@ function git_odb_set_commit_graph(odb: Pgit_odb; cgraph: Pgit_commit_graph): Int
 
 (** @}  *)
 
-
-