Update to 1.3.2

Author: todaysoftware

src/git2/attr.inc

@@ -141,11 +141,17 @@ type
     version: Cardinal;
     (** A combination of GIT_ATTR_CHECK flags *)
     flags: Cardinal;
+
+    {$IFDEF GIT_DEPRECATE_HARD}
+    commit_id: Pgit_oid;
+    {$ELSE}
+    reserved: Pointer;
+    {$ENDIF}
     (**
      * The commit to load attributes from, when
      * `GIT_ATTR_CHECK_INCLUDE_COMMIT` is specified.
      *)
-    commit_id: Pgit_oid;
+    attr_commit_id: git_oid;
   end;
   Pgit_attr_options = ^git_attr_options;
 

src/git2/blob.inc

@@ -125,11 +125,16 @@ type
     version: Integer;
     (** Flags to control the filtering process, see `git_blob_filter_flag_t` above  *)
     flags: uint32_t;
+    {$IFDEF GIT_DEPRECATE_HARD}
+    commit_id: Pgit_oid;
+    {$ELSE}
+    reserved: Pointer;
+    {$ENDIF}
     (**
      * The commit to load attributes from, when
      * `GIT_BLOB_FILTER_ATTRIBUTES_FROM_COMMIT` is specified.
      *)
-    commit_id: Pgit_oid;
+    attr_commit_id: git_oid;
   end;
   Pgit_blob_filter_options = ^git_blob_filter_options;
 

src/git2/common.inc

@@ -4,7 +4,7 @@
  * @defgroup git_common Git common platform definitions
  * @ingroup Git
  * @{
-  *)
+ *)
 
 const
   {$IFDEF MSWINDOWS}
@@ -128,6 +128,10 @@ const
   GIT_OPT_SET_MWINDOW_FILE_LIMIT = 30;
   GIT_OPT_SET_ODB_PACKED_PRIORITY = 31;
   GIT_OPT_SET_ODB_LOOSE_PRIORITY = 32;
+  GIT_OPT_GET_EXTENSIONS      = 33;
+  GIT_OPT_SET_EXTENSIONS      = 34;
+  GIT_OPT_GET_OWNER_VALIDATION = 35;
+  GIT_OPT_SET_OWNER_VALIDATION = 36;
 type
   git_libgit2_opt_t = Integer;
 
@@ -351,11 +355,36 @@ type
    *              > Override the default priority of the loose ODB backend which
    *              > is added when default backends are assigned to a repository
    *
+   *   opts(GIT_OPT_GET_EXTENSIONS, git_strarray *out)
+   *      > Returns the list of git extensions that are supported.  This
+   *      > is the list of built-in extensions supported by libgit2 and
+   *      > custom extensions that have been added with
+   *      > `GIT_OPT_SET_EXTENSIONS`.  Extensions that have been negated
+   *      > will not be returned.  The returned list should be released
+   *      > with `git_strarray_dispose`.
+   *
+   *   opts(GIT_OPT_SET_EXTENSIONS, const char **extensions, size_t len)
+   *      > Set that the given git extensions are supported by the caller.
+   *      > Extensions supported by libgit2 may be negated by prefixing
+   *      > them with a `!`.  For example: setting extensions to
+   *      > { "!noop", "newext" } indicates that the caller does not want
+   *      > to support repositories with the `noop` extension but does want
+   *      > to support repositories with the `newext` extension.
+   *
+   *   opts(GIT_OPT_GET_OWNER_VALIDATION, int *enabled)
+   *      > Gets the owner validation setting for repository
+   *      > directories.
+   *
+   *   opts(GIT_OPT_SET_OWNER_VALIDATION, int enabled)
+   *      > Set that repository directories should be owned by the current
+   *      > user. The default is to validate ownership.
+   *
    * @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,6 +96,8 @@ const
    * diff hunks.
    *)
   GIT_DIFF_INDENT_HEURISTIC   = (1 shl 18);
+	(** 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  *)
@@ -126,8 +128,6 @@ const
    *  can apply given diff information to binary files.
    *)
   GIT_DIFF_SHOW_BINARY        = (1 shl 30);
-  (** Ignore blank lines  *)
-  GIT_DIFF_IGNORE_BLANK_LINES = (1 shl 31);
 type
   git_diff_option_t = Integer;
 
@@ -1272,89 +1272,6 @@ function git_diff_stats_to_buf(out_: Pgit_buf; stats: Pgit_diff_stats; format: g
 
 procedure git_diff_stats_free(stats: Pgit_diff_stats); cdecl; external libgit2_dll;
 
-(**
- * Formatting options for diff e-mail generation
- *)
-
-const
-  (** Normal patch, the default  *)
-  GIT_DIFF_FORMAT_EMAIL_NONE  = 0;
-  (** Don't insert "[PATCH]" in the subject header *)
-  GIT_DIFF_FORMAT_EMAIL_EXCLUDE_SUBJECT_PATCH_MARKER = (1 shl 0);
-type
-  git_diff_format_email_flags_t = Integer;
-
-  (**
-   * Options for controlling the formatting of the generated e-mail.
-   *)
-
-type
-  git_diff_format_email_options = record
-    version: Cardinal;
-    (** see `git_diff_format_email_flags_t` above  *)
-    flags: uint32_t;
-    (** This patch number  *)
-    patch_no: size_t;
-    (** Total number of patches in this series  *)
-    total_patches: size_t;
-    (** id to use for the commit  *)
-    id: Pgit_oid;
-    (** Summary of the change  *)
-    summary: PAnsiChar;
-    (** Commit message's body  *)
-    body: PAnsiChar;
-    (** Author of the change  *)
-    author: Pgit_signature;
-  end;
-  Pgit_diff_format_email_options = ^git_diff_format_email_options;
-
-const
-  GIT_DIFF_FORMAT_EMAIL_OPTIONS_VERSION = 1;
-  //GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT = { GIT_DIFF_FORMAT_EMAIL_OPTIONS_VERSION , 0 , 1 , 1 , NULL , NULL , NULL , NULL };
-  (**
-   * Create an e-mail ready patch from a diff.
-   *
-   * @param out buffer to store the e-mail patch in
-   * @param diff containing the commit
-   * @param opts structure with options to influence content and formatting.
-   * @return 0 or an error code
-   *)
-
-function git_diff_format_email(out_: Pgit_buf; diff: Pgit_diff;
-  opts: Pgit_diff_format_email_options): Integer; cdecl; external libgit2_dll;
-
-(**
- * Create an e-mail ready patch for a commit.
- *
- * Does not support creating patches for merge commits (yet).
- *
- * @param out buffer to store the e-mail patch in
- * @param repo containing the commit
- * @param commit pointer to up commit
- * @param patch_no patch number of the commit
- * @param total_patches total number of patches in the patch set
- * @param flags determines the formatting of the e-mail
- * @param diff_opts structure with options to influence diff or NULL for defaults.
- * @return 0 or an error code
- *)
-
-function git_diff_commit_as_email(out_: Pgit_buf; repo: Pgit_repository; commit: Pgit_commit;
-  patch_no, total_patches: size_t; flags: uint32_t; diff_opts: Pgit_diff_options): Integer; cdecl; external libgit2_dll;
-
-(**
- * Initialize git_diff_format_email_options structure
- *
- * Initializes a `git_diff_format_email_options` with default values. Equivalent
- * to creating an instance with GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT.
- *
- * @param opts The `git_blame_options` struct to initialize.
- * @param version The struct version; pass `GIT_DIFF_FORMAT_EMAIL_OPTIONS_VERSION`.
- * @return Zero on success; -1 on failure.
- *)
-
-function git_diff_format_email_options_init(opts: Pgit_diff_format_email_options;
-  version: Cardinal): Integer; cdecl; external libgit2_dll;
-
 (**
  * Patch ID options structure
  *

src/git2/email.inc

@@ -0,0 +1,120 @@
+(**
+ * @file git2/email.h
+ * @brief Git email formatting and application routines.
+ * @ingroup Git
+ * @{
+ *)
+
+ (**
+ * Formatting options for diff e-mail generation
+ *)
+
+const
+  (** Normal patch, the default  *)
+  GIT_EMAIL_CREATE_DEFAULT    = 0;
+  (** do not include patch numbers in the subject prefix. *)
+  GIT_EMAIL_CREATE_OMIT_NUMBERS = 1 shl 0;
+
+  (**
+   * Include numbers in the subject prefix even when the
+   * patch is for a single commit (1/1).
+   *)
+  GIT_EMAIL_CREATE_ALWAYS_NUMBER = 1 shl 1;
+
+  (** Do not perform rename or similarity detection. *)
+  GIT_EMAIL_CREATE_NO_RENAMES = 1 shl 2;
+type
+  git_email_create_flags_t = Integer;
+
+  (**
+   * Options for controlling the formatting of the generated e-mail.
+   *)
+
+type
+  git_email_create_options = record
+    version: Cardinal;
+    (** see `git_email_create_flags_t` above  *)
+    flags: uint32_t;
+    (** Options to use when creating diffs *)
+    diff_opts: git_diff_options;
+
+    (** Options for finding similarities within diffs *)
+    diff_find_opts: git_diff_find_options;
+
+    (**
+     * The subject prefix, by default "PATCH".  If set to an empty
+     * string ("") then only the patch numbers will be shown in the
+     * prefix.  If the subject_prefix is empty and patch numbers
+     * are not being shown, the prefix will be omitted entirely.
+     *)
+    subject_prefix: PAnsiChar;
+
+    (**
+     * The starting patch number; this cannot be 0.  By default,
+     * this is 1.
+     *)
+    start_number: size_t;
+
+    (** The "re-roll" number.  By default, there is no re-roll. *)
+    reroll_number: size_t;
+
+    (** This patch number  *)
+    patch_no: size_t;
+    (** Total number of patches in this series  *)
+    total_patches: size_t;
+    (** id to use for the commit  *)
+    id: Pgit_oid;
+    (** Summary of the change  *)
+    summary: PAnsiChar;
+    (** Commit message's body  *)
+    body: PAnsiChar;
+    (** Author of the change  *)
+    author: Pgit_signature;
+  end;
+  Pgit_email_create_options = ^git_email_create_options;
+
+const
+  GIT_EMAIL_CREATE_OPTIONS_VERSION = 1;
+  (*GIT_EMAIL_CREATE_OPTIONS_INIT =
+  { \
+   GIT_EMAIL_CREATE_OPTIONS_VERSION, \
+   GIT_EMAIL_CREATE_DEFAULT, \
+   { GIT_DIFF_OPTIONS_VERSION, GIT_DIFF_SHOW_BINARY, GIT_SUBMODULE_IGNORE_UNSPECIFIED, {NULL,0}, NULL, NULL, NULL, 3 }, \
+   GIT_DIFF_FIND_OPTIONS_INIT \
+  }
+  *)
+
+(**
+ * Create a diff for a commit in mbox format for sending via email.
+ *
+ * @param out buffer to store the e-mail patch in
+ * @param diff the changes to include in the email
+ * @param patch_idx the patch index
+ * @param patch_count the total number of patches that will be included
+ * @param commit_id the commit id for this change
+ * @param summary the commit message for this change
+ * @param body optional text to include above the diffstat
+ * @param author the person who authored this commit
+ * @param opts email creation options
+ *)
+
+function git_email_create_from_diff(_out: Pgit_buf; diff: Pgit_diff; patch_idx: size_t; patch_count: size_t;
+  commit_id: Pgit_oid; summary: PAnsiChar; body: PAnsiChar; author: Pgit_signature;
+  opts: Pgit_email_create_options): Integer; cdecl; external libgit2_dll;
+
+(**
+ * Create a diff for a commit in mbox format for sending via email.
+ * The commit must not be a merge commit.
+ *
+ * @param out buffer to store the e-mail patch in
+ * @param commit commit to create a patch for
+ * @param opts email creation options
+ *)
+
+function git_email_create_from_commit(_out: Pgit_buf; commit: Pgit_commit;
+  opts: Pgit_email_create_options): Integer; cdecl; external libgit2_dll;
+
+(** @}  *)
+
+
+

src/git2/errors.inc

@@ -43,6 +43,7 @@ const
   GIT_EMISMATCH               = -33; (**< Hashsum mismatch in object  *)
   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 *)
 type
   git_error_code = Integer;
 
@@ -156,3 +157,4 @@ procedure git_error_set_oom; cdecl; external libgit2_dll;
 (** @}  *)
 
 
+

src/git2/filter.inc

@@ -51,11 +51,16 @@ type
     (** See `git_filter_flag_t` above *)
     flags: Cardinal;
 
+    {$IFDEF GIT_DEPRECATE_HARD}
+    commit_id: Pgit_oid;
+    {$ELSE}
+    reserved: Pointer;
+    {$ENDIF}
     (**
      * The commit to load attributes from, when
      * `GIT_FILTER_ATTRIBUTES_FROM_COMMIT` is specified.
      *)
-    commit_id: Pgit_oid;
+    attr_commit_id: git_oid;
   end;
   Pgit_filter_options = ^git_filter_options;
 

src/git2/oidarray.inc

@@ -7,23 +7,20 @@ type
   end;
 
   (**
-   * Free the OID array
-   *
-   * This method must (and must only) be called on `git_oidarray`
-   * objects where the array is allocated by the library. Not doing so,
-   * will result in a memory leak.
+   * Free the object IDs contained in an oid_array.  This method should
+   * be called on `git_oidarray` objects that were provided by the
+   * library.  Not doing so will result in a memory leak.
    *
    * This does not free the `git_oidarray` itself, since the library will
-   * never allocate that object directly itself (it is more commonly embedded
-   * inside another struct or created on the stack).
+   * never allocate that object directly itself.
    *
    * @param array git_oidarray from which to free oid data
    *)
 
 type
   Pgit_oidarray = ^git_oidarray;
 
-procedure git_oidarray_free(array_: Pgit_oidarray); cdecl; external libgit2_dll;
+procedure git_oidarray_dispose(array_: Pgit_oidarray); cdecl; external libgit2_dll;
 
 (** @}  *)