Update to 1.7.2

Author: todaysoftware

README.md

@@ -3,7 +3,7 @@
 Details
 -------
 
-Delphi / Free Pascal bindings for [libgit2](http://libgit2.github.com/) v1.6(.5).
+Delphi / Free Pascal bindings for [libgit2](http://libgit2.github.com/) v1.7(.2).
 
 Since I could not find anything very up to date in the Delphi/Pascal world for recent libgit2 versions I decided to do something myself with assistance from [CHelper](https://wiki.freepascal.org/Chelper).
 

src/git2/common.inc

@@ -145,6 +145,10 @@ const
   GIT_OPT_SET_OWNER_VALIDATION = 36;
   GIT_OPT_GET_HOMEDIR         = 37;
   GIT_OPT_SET_HOMEDIR         = 38;
+  GIT_OPT_SET_SERVER_CONNECT_TIMEOUT = 39;
+  GIT_OPT_GET_SERVER_CONNECT_TIMEOUT = 40;
+  GIT_OPT_SET_SERVER_TIMEOUT  = 41;
+  GIT_OPT_GET_SERVER_TIMEOUT  = 42;
 type
   git_libgit2_opt_t = Integer;
 
@@ -402,12 +406,30 @@ type
    *      >
    *      > - `path` directory of home directory.
    *
+   *   opts(GIT_OPT_GET_SERVER_CONNECT_TIMEOUT, int *timeout)
+   *      > Gets the timeout (in milliseconds) to attempt connections to
+   *      > a remote server.
+   *
+   *   opts(GIT_OPT_SET_SERVER_CONNECT_TIMEOUT, int timeout)
+   *      > Sets the timeout (in milliseconds) to attempt connections to
+   *      > a remote server. This is supported only for HTTP(S) connections
+   *      > and is not supported by SSH. Set to 0 to use the system default.
+   *      > Note that this may not be able to be configured longer than the
+   *      > system default, typically 75 seconds.
+   *
+   *   opts(GIT_OPT_GET_SERVER_TIMEOUT, int *timeout)
+   *      > Gets the timeout (in milliseconds) for reading from and writing
+   *      > to a remote server.
+   *
+   *   opts(GIT_OPT_SET_SERVER_TIMEOUT, int timeout)
+   *      > Sets the timeout (in milliseconds) for reading from and writing
+   *      > to a remote server. This is supported only for HTTP(S)
+   *      > connections and is not supported by SSH. Set to 0 to use the
+   *      > system default.
+   *
    * @param option Option key
    * @param ... value to set the option
    * @return 0 on success, <0 on failure
    *)
 
 function git_libgit2_opts(option: Integer): Integer; cdecl; varargs; external libgit2_dll;
-
-
-

src/git2/diff.inc

@@ -96,8 +96,8 @@ const
    * diff hunks.
    *)
   GIT_DIFF_INDENT_HEURISTIC   = (1 shl 18);
-	(** Ignore blank lines *)
-	GIT_DIFF_IGNORE_BLANK_LINES = (1 shl 19);
+  (** Ignore blank lines *)
+  GIT_DIFF_IGNORE_BLANK_LINES = (1 shl 19);
   (** Treat all files as text, disabling binary attributes & detection  *)
   GIT_DIFF_FORCE_TEXT         = (1 shl 20);
   (** Treat all files as binary, disabling text diffs  *)
@@ -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_SHA1_HEXSIZE`, 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.
      *)
@@ -374,6 +374,21 @@ type
      * the hunks will be merged into one. Defaults to 0.
      *)
     interhunk_lines: uint32_t;
+    (**
+     * The object ID type to emit in diffs; this is used by functions
+     * that operate without a repository - namely `git_diff_buffers`,
+     * or `git_diff_blobs` and `git_diff_blob_to_buffer` when one blob
+     * is `NULL`.
+     *
+     * This may be omitted (set to `0`). If a repository is available,
+     * the object ID format of the repository will be used. If no
+     * repository is available then the default is `GIT_OID_SHA`.
+     *
+     * If this is specified and a repository is available, then the
+     * specified `oid_type` must match the repository's object ID
+     * format.
+     *)
+    oid_type: git_oid_t;
     (**
      * The abbreviation length to use when formatting object ids.
      * Defaults to the value of 'core.abbrev' from the config, or 7 if unset.
@@ -700,7 +715,7 @@ type
      *)
     copy_threshold: uint16_t;
     (**
-  	 * Threshold below which similar files will be split into a delete/add pair.
+     * Threshold below which similar files will be split into a delete/add pair.
      * This is equivalent to the last part of the -B option. Defaults to 60.
      *)
     break_rewrite_threshold: uint16_t;
@@ -1075,7 +1090,7 @@ function git_diff_to_buf(out_: Pgit_buf; diff: Pgit_diff; format: git_diff_forma
 (**@} *)
 
 (*
- * Misc
+ * Low-level file comparison, invoking callbacks per difference.
  *)
 
 (**
@@ -1168,27 +1183,53 @@ function git_diff_buffers(old_buffer: Pointer; old_len: size_t; old_as_path: PAn
   binary_cb: git_diff_binary_cb; hunk_cb: git_diff_hunk_cb; line_cb: git_diff_line_cb;
   payload: Pointer): Integer; cdecl; external libgit2_dll;
 
+(* Patch file parsing. *)
+
 (**
- * Read the contents of a git patch file into a `git_diff` object.
- *
- * The diff object produced is similar to the one that would be
- * produced if you actually produced it computationally by comparing
- * two trees, however there may be subtle differences.  For example,
- * a patch file likely contains abbreviated object IDs, so the
- * object IDs in a `git_diff_delta` produced by this function will
- * also be abbreviated.
- *
- * This function will only read patch files created by a git
- * implementation, it will not read unified diffs produced by
- * the `diff` program, nor any other types of patch files.
- *
- * @param out A pointer to a git_diff pointer that will be allocated.
- * @param content The contents of a patch file
- * @param content_len The length of the patch file contents
- * @return 0 or an error code
+ * Options for parsing a diff / patch file.
  *)
+type
+  git_diff_parse_options = record
+    version: Cardinal;
+    oid_type: git_oid_t;
+  end;
+  Pgit_diff_parse_options = ^git_diff_parse_options;
+
+  (* The current version of the diff parse options structure *)
+const
+  GIT_DIFF_PARSE_OPTIONS_VERSION = 1;
+
+  (* Stack initializer for diff parse options.  Alternatively use
+   * `git_diff_parse_options_init` programmatic initialization.
+   *)
+  //#define GIT_DIFF_PARSE_OPTIONS_INIT \
+  //	{ GIT_DIFF_PARSE_OPTIONS_VERSION, GIT_OID_DEFAULT }
+
+  (**
+   * Read the contents of a git patch file into a `git_diff` object.
+   *
+   * The diff object produced is similar to the one that would be
+   * produced if you actually produced it computationally by comparing
+   * two trees, however there may be subtle differences.  For example,
+   * a patch file likely contains abbreviated object IDs, so the
+   * object IDs in a `git_diff_delta` produced by this function will
+   * also be abbreviated.
+   *
+   * This function will only read patch files created by a git
+   * implementation, it will not read unified diffs produced by
+   * the `diff` program, nor any other types of patch files.
+   *
+   * @param out A pointer to a git_diff pointer that will be allocated.
+   * @param content The contents of a patch file
+   * @param content_len The length of the patch file contents
+   * @return 0 or an error code
+   *)
 
-function git_diff_from_buffer(out_: PPgit_diff; content: PAnsiChar; content_len: size_t): Integer; cdecl; external libgit2_dll;
+function git_diff_from_buffer(out_: PPgit_diff; content: PAnsiChar; content_len: size_t
+  {$IFDEF GIT_EXPERIMENTAL_SHA256}
+  ; opts: Pgit_diff_parse_options
+  {$ENDIF}
+  ): Integer; cdecl; external libgit2_dll;
 
 (**
  * This is an opaque structure which is allocated by `git_diff_get_stats`.
@@ -1229,6 +1270,7 @@ type
 type
   PPgit_diff_stats = ^Pgit_diff_stats;
   Pgit_diff_stats = ^git_diff_stats;
+
 function git_diff_get_stats(out_: PPgit_diff_stats; diff: Pgit_diff): Integer; cdecl; external libgit2_dll;
 
 (**
@@ -1334,5 +1376,3 @@ function git_diff_patchid(out_: Pgit_oid; diff: Pgit_diff; opts: Pgit_diff_patch
 
 (** @}  *)
 
-
-

src/git2/errors.inc

@@ -44,6 +44,7 @@ const
   GIT_EINDEXDIRTY             = -34; (**< Unsaved changes in the index would be overwritten  *)
   GIT_EAPPLYFAIL              = -35; (**< Patch application failed  *)
   GIT_EOWNER                  = -36; (**< The object is not owned by the current user *)
+  GIT_TIMEOUT                 = -37; (**< The operation timed out *)
 type
   git_error_code = Integer;
 
@@ -99,6 +100,7 @@ const
   GIT_ERROR_SHA               = 33;
   GIT_ERROR_HTTP              = 34;
   GIT_ERROR_INTERNAL          = 35;
+  GIT_ERROR_GRAFTS            = 36;
 type
   git_error_t = Integer;
 
@@ -169,5 +171,3 @@ procedure git_error_set_oom; cdecl; external libgit2_dll;
 
 (** @}  *)
 
-
-

src/git2/index.inc

@@ -169,7 +169,11 @@ type
    * @return 0 or an error code
    *)
 
-function git_index_open(out_: PPgit_index; index_path: PAnsiChar): Integer; cdecl; external libgit2_dll;
+function git_index_open(out_: PPgit_index; index_path: PAnsiChar
+  {$IFDEF GIT_EXPERIMENTAL_SHA256}
+  ; oid_type: git_oid_t
+  {$ENDIF}
+  ): Integer; cdecl; external libgit2_dll;
 
 (**
  * Create an in-memory index object.
@@ -183,7 +187,11 @@ function git_index_open(out_: PPgit_index; index_path: PAnsiChar): Integer; cdec
  * @return 0 or an error code
  *)
 
-function git_index_new(out_: PPgit_index): Integer; cdecl; external libgit2_dll;
+function git_index_new(out_: PPgit_index
+  {$IFDEF GIT_EXPERIMENTAL_SHA256}
+  ; oid_type: git_oid_t
+  {$ENDIF}
+  ): Integer; cdecl; external libgit2_dll;
 
 (**
  * Free an existing index object.
@@ -842,5 +850,3 @@ procedure git_index_conflict_iterator_free(iterator: Pgit_index_conflict_iterato
 
 (** @}  *)
 
-
-

src/git2/oid.inc

@@ -226,7 +226,7 @@ function git_oid_pathfmt(out_: PAnsiChar; id: Pgit_oid): Integer; cdecl; externa
  * concurrent calls of the function.
  *
  * @param oid The oid structure to format
- * @return the c-string
+ * @return the c-string or NULL on failure
  *)
 
 function git_oid_tostr_s(oid: Pgit_oid): PAnsiChar; cdecl; external libgit2_dll;

src/git2/remote.inc

@@ -289,6 +289,14 @@ const
 type
   git_remote_redirect_t = Integer;
 
+const
+  (** Constants for fetch depth (shallowness of fetch). *)
+  (** The fetch is "full" (not shallow). This is the default. *)
+  GIT_FETCH_DEPTH_FULL        = 0;
+
+  (** The fetch should "unshallow" and fetch missing data. *)
+  GIT_FETCH_DEPTH_UNSHALLOW   = 2147483647;
+
   (**
    * Fetch options structure.
    *
@@ -297,7 +305,7 @@ type
    *
    *		git_fetch_options opts = GIT_FETCH_OPTIONS_INIT;
    *)
-
+type
   git_fetch_options = record
     version: Cardinal;
     (**
@@ -325,6 +333,14 @@ type
      * Proxy options to use, by default no proxy is used.
      *)
     proxy_opts: git_proxy_options;
+    (**
+     * Depth of the fetch to perform, or `GIT_FETCH_DEPTH_FULL`
+     * (or `0`) for full history, or `GIT_FETCH_DEPTH_UNSHALLOW`
+     * to "unshallow" a shallow repository.
+     *
+     * The default is full (`GIT_FETCH_DEPTH_FULL` or `0`).
+     *)
+    depth: Integer;
     (**
      * Whether to allow off-site redirects.  If this is not
      * specified, the `http.followRedirects` configuration setting
@@ -1129,5 +1145,3 @@ function git_remote_default_branch(out_: Pgit_buf; remote: Pgit_remote): Integer
 
 (** @}  *)
 
-
-

src/git2/repository.inc

@@ -45,9 +45,14 @@ function git_repository_open_from_worktree(out_: PPgit_repository; wt: Pgit_work
  * @param out pointer to the repo
  * @param odb the object database to wrap
  * @return 0 or an error code
+ * @param oid_type the oid type of the object database
  *)
 
-function git_repository_wrap_odb(out_: PPgit_repository; odb: Pgit_odb): Integer; cdecl; external libgit2_dll;
+function git_repository_wrap_odb(out_: PPgit_repository; odb: Pgit_odb
+  {$IFDEF GIT_EXPERIMENTAL_SHA256}
+  ; oid_type: git_oid_t
+  {$ENDIF}
+  ): Integer; cdecl; external libgit2_dll;
 
 (**
  * Look for a git repository and copy its path in the given buffer.

src/git2/version.inc

@@ -3,16 +3,16 @@ const
    * The version string for libgit2.  This string follows semantic
    * versioning (v2) guidelines.
    *)
-  LIBGIT2_VERSION             = '1.6.5';
+  LIBGIT2_VERSION             = '1.7.2';
 
   (** The major version number for this version of libgit2. *)
   LIBGIT2_VER_MAJOR           = 1;
 
   (** The minor version number for this version of libgit2. *)
-  LIBGIT2_VER_MINOR           = 6;
+  LIBGIT2_VER_MINOR           = 7;
 
   (** The revision ("teeny") version number for this version of libgit2. *)
-  LIBGIT2_VER_REVISION        = 5;
+  LIBGIT2_VER_REVISION        = 2;
 
   (** The Windows DLL patch number for this version of libgit2. *)
   LIBGIT2_VER_PATCH           = 0;
@@ -26,7 +26,7 @@ const
   LIBGIT2_VER_PRERELEASE      : PAnsiChar = nil;
 
   (** The library ABI soversion for this version of libgit2. *)
-  LIBGIT2_SOVERSION           = '1.6';
+  LIBGIT2_SOVERSION           = '1.7';
 
 
 

src/git2/worktree.inc

@@ -228,7 +228,9 @@ function git_worktree_prune_options_init(opts: Pgit_worktree_prune_options; vers
  *
  * If the worktree is not valid and not locked or if the above
  * flags have been passed in, this function will return a
- * positive value.
+ * positive value. If the worktree is not prunable, an error
+ * message will be set (visible in `giterr_last`) with details about
+ * why.
  *
  * @param wt Worktree to check.
  * @param opts The prunable options.