Update to v1.2.0

Author: todaysoftware

src/git2/attr.inc

@@ -121,11 +121,35 @@ const
  *
  * Passing the `GIT_ATTR_CHECK_INCLUDE_HEAD` flag will use attributes
  * from a `.gitattributes` file in the repository at the HEAD revision.
+ *
+ * Passing the `GIT_ATTR_CHECK_INCLUDE_COMMIT` flag will use attributes
+ * from a `.gitattributes` file in a specific commit.
   *)
 
   GIT_ATTR_CHECK_NO_SYSTEM = ( 1 shl 2 );
   GIT_ATTR_CHECK_INCLUDE_HEAD = ( 1 shl 3 );
+  GIT_ATTR_CHECK_INCLUDE_COMMIT = ( 1 shl 4 );
   (**
+  * An options structure for querying attributes.
+  *)
+type
+  git_attr_options = record
+    version: Cardinal;
+    (** A combination of GIT_ATTR_CHECK flags *)
+    flags: Cardinal;
+    (**
+     * The commit to load attributes from, when
+     * `GIT_ATTR_CHECK_INCLUDE_COMMIT` is specified.
+     *)
+    commit_id: Pgit_oid;
+  end;
+  Pgit_attr_options = ^git_attr_options;
+
+const
+  GIT_ATTR_OPTIONS_VERSION = 1;
+  //GIT_ATTR_OPTIONS_INIT {GIT_ATTR_OPTIONS_VERSION}
+
+(**
  * Look up the value of one git attribute for path.
  *
  * @param value_out Output of the value of the attribute.  Use the GIT_ATTR_...
@@ -144,6 +168,24 @@ const
 function git_attr_get(value_out: PPAnsiChar; repo: Pgit_repository;
   flags: uint32_t; path, name_: PAnsiChar): Integer; cdecl; external libgit2_dll;
 
+(**
+ * Look up the value of one git attribute for path with extended options.
+ *
+ * @param value_out Output of the value of the attribute.  Use the GIT_ATTR_...
+ *             macros to test for TRUE, FALSE, UNSPECIFIED, etc. or just
+ *             use the string value for attributes set to a value.  You
+ *             should NOT modify or free this value.
+ * @param repo The repository containing the path.
+ * @param opts The `git_attr_options` to use when querying these attributes.
+ * @param path The path to check for attributes.  Relative paths are
+ *             interpreted relative to the repo root.  The file does
+ *             not have to exist, but if it does not, then it will be
+ *             treated as a plain file (not a directory).
+ * @param name The name of the attribute to look up.
+ *)
+function git_attr_get_ext(value_out: PPAnsiChar; repo: Pgit_repository;
+  opts: Pgit_attr_options; path, name_: PAnsiChar): Integer; cdecl; external libgit2_dll;
+
 (**
  * Look up a list of git attributes for path.
  *
@@ -177,6 +219,25 @@ function git_attr_get(value_out: PPAnsiChar; repo: Pgit_repository;
 function git_attr_get_many(values_out: PPAnsiChar; repo: Pgit_repository;
   flags: uint32_t; path: PAnsiChar; num_attr: size_t; names: PPAnsiChar): Integer; cdecl; external libgit2_dll;
 
+(**
+ * Look up a list of git attributes for path with extended options.
+ *
+ * @param values_out An array of num_attr entries that will have string
+ *             pointers written into it for the values of the attributes.
+ *             You should not modify or free the values that are written
+ *             into this array (although of course, you should free the
+ *             array itself if you allocated it).
+ * @param repo The repository containing the path.
+ * @param opts The `git_attr_options` to use when querying these attributes.
+ * @param path The path inside the repo to check attributes.  This
+ *             does not have to exist, but if it does not, then
+ *             it will be treated as a plain file (i.e. not a directory).
+ * @param num_attr The number of attributes being looked up
+ * @param names An array of num_attr strings containing attribute names.
+ *)
+function git_attr_get_many_ext(values_out: PPAnsiChar; repo: Pgit_repository;
+  opts: Pgit_attr_options; path: PAnsiChar; num_attr: size_t; names: PPAnsiChar): Integer; cdecl; external libgit2_dll;
+
 (**
  * The callback used with git_attr_foreach.
  *
@@ -215,6 +276,22 @@ type
 function git_attr_foreach(repo: Pgit_repository; flags: uint32_t;
   path: PAnsiChar; callback: git_attr_foreach_cb; payload: Pointer): Integer; cdecl; external libgit2_dll;
 
+(**
+ * Loop over all the git attributes for a path with extended options.
+ *
+ * @param repo The repository containing the path.
+ * @param opts The `git_attr_options` to use when querying these attributes.
+ * @param path Path inside the repo to check attributes.  This does not have
+ *             to exist, but if it does not, then it will be treated as a
+ *             plain file (i.e. not a directory).
+ * @param callback Function to invoke on each attribute name and value.
+ *                 See git_attr_foreach_cb.
+ * @param payload Passed on as extra parameter to callback function.
+ * @return 0 on success, non-zero callback return value, or error code
+ *)
+function git_attr_foreach_ext(repo: Pgit_repository; opts: Pgit_attr_options;
+  path: PAnsiChar; callback: git_attr_foreach_cb; payload: Pointer): Integer; cdecl; external libgit2_dll;
+
 (**
  * Flush the gitattributes cache.
  *

src/git2/blame.inc

@@ -13,26 +13,44 @@
 const
   (** Normal blame, the default  *)
   GIT_BLAME_NORMAL = 0;
-  (** Track lines that have moved within a file (like `git blame -M`).
-	 * NOT IMPLEMENTED.  *)
+  (**
+   * Track lines that have moved within a file (like `git blame -M`).
+   *
+   * This is not yet implemented and reserved for future use.
+   *)
   GIT_BLAME_TRACK_COPIES_SAME_FILE = ( 1 shl 0 );
-  (** Track lines that have moved across files in the same commit (like `git blame -C`).
-	 * NOT IMPLEMENTED.  *)
+  (**
+   * Track lines that have moved across files in the same commit
+   * (like `git blame -C`).
+   *
+   * This is not yet implemented and reserved for future use.
+   *)
   GIT_BLAME_TRACK_COPIES_SAME_COMMIT_MOVES = ( 1 shl 1 );
-  (** Track lines that have been copied from another file that exists in the
-	 * same commit (like `git blame -CC`). Implies SAME_FILE.
-	 * NOT IMPLEMENTED.  *)
+  (**
+   * Track lines that have been copied from another file that exists
+   * in the same commit (like `git blame -CC`).  Implies SAME_FILE.
+   *
+   * This is not yet implemented and reserved for future use.
+   *)
   GIT_BLAME_TRACK_COPIES_SAME_COMMIT_COPIES = ( 1 shl 2 );
-  (** Track lines that have been copied from another file that exists in *any*
-	 * commit (like `git blame -CCC`). Implies SAME_COMMIT_COPIES.
-	 * NOT IMPLEMENTED.  *)
+  (**
+   * Track lines that have been copied from another file that exists in
+   * *any* commit (like `git blame -CCC`).  Implies SAME_COMMIT_COPIES.
+   *
+   * This is not yet implemented and reserved for future use.
+   *)
   GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES = ( 1 shl 3 );
-  (** Restrict the search of commits to those reachable following only the
-	 * first parents.  *)
+  (**
+   * Restrict the search of commits to those reachable following only
+   * the first parents.
+   *)
   GIT_BLAME_FIRST_PARENT = ( 1 shl 4 );
-  (** Use mailmap file to map author and committer names and email addresses
-	 * to canonical real names and email addresses. The mailmap will be read
-	 * from the working directory, or HEAD in a bare repository.  *)
+  (**
+   * Use mailmap file to map author and committer names and email
+   * addresses to canonical real names and email addresses. The
+   * mailmap will be read from the working directory, or HEAD in a
+   * bare repository.
+   *)
   GIT_BLAME_USE_MAILMAP = ( 1 shl 5 );
   (** Ignore whitespace differences  *)
   GIT_BLAME_IGNORE_WHITESPACE = ( 1 shl 6 );
@@ -52,12 +70,15 @@ type
     version : Cardinal;
     (** A combination of `git_blame_flag_t`  *)
     flags : uint32_t;
-    (** The lower bound on the number of alphanumeric
-	 *   characters that must be detected as moving/copying within a file for it to
-	 *   associate those lines with the parent commit. The default value is 20.
-	 *   This value only takes effect if any of the `GIT_BLAME_TRACK_COPIES_*`
-	 *   flags are specified.
-	  *)
+    (**
+     * The lower bound on the number of alphanumeric characters that
+     * must be detected as moving/copying within a file for it to
+     * associate those lines with the parent commit. The default value
+     * is 20.
+     *
+     * This value only takes effect if any of the `GIT_BLAME_TRACK_COPIES_*`
+     * flags are specified.
+     *)
     min_match_characters : uint16_t;
     (** The id of the newest commit to consider. The default is HEAD.  *)
     newest_commit : git_oid;
@@ -98,41 +119,54 @@ function git_blame_options_init(opts: Pgit_blame_options; version: Cardinal)
 
 (**
  * Structure that represents a blame hunk.
- *
- * - `lines_in_hunk` is the number of lines in this hunk
- * - `final_commit_id` is the OID of the commit where this line was last
- *   changed.
- * - `final_start_line_number` is the 1-based line number where this hunk
- *   begins, in the final version of the file
- * - `final_signature` is the author of `final_commit_id`. If
- *   `GIT_BLAME_USE_MAILMAP` has been specified, it will contain the canonical
- *    real name and email address.
- * - `orig_commit_id` is the OID of the commit where this hunk was found.  This
- *   will usually be the same as `final_commit_id`, except when
- *   `GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES` has been specified.
- * - `orig_path` is the path to the file where this hunk originated, as of the
- *   commit specified by `orig_commit_id`.
- * - `orig_start_line_number` is the 1-based line number where this hunk begins
- *   in the file named by `orig_path` in the commit specified by
- *   `orig_commit_id`.
- * - `orig_signature` is the author of `orig_commit_id`. If
- *   `GIT_BLAME_USE_MAILMAP` has been specified, it will contain the canonical
- *    real name and email address.
- * - `boundary` is 1 iff the hunk has been tracked to a boundary commit (the
- *   root, or the commit specified in git_blame_options.oldest_commit)
-  *)
+ *)
 
 type
   git_blame_hunk = record
+    (**
+     * The number of lines in this hunk.
+     *)
     lines_in_hunk : size_t;
+    (**
+     * The OID of the commit where this line was last changed.
+     *)
     final_commit_id : git_oid;
+    (**
+     * The 1-based line number where this hunk begins, in the final version
+     * of the file.
+     *)
     final_start_line_number : size_t;
+    (**
+     * The author of `final_commit_id`. If `GIT_BLAME_USE_MAILMAP` has been
+     * specified, it will contain the canonical real name and email address.
+     *)
     final_signature : Pgit_signature;
+    (**
+     * The OID of the commit where this hunk was found.
+     * This will usually be the same as `final_commit_id`, except when
+     * `GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES` has been specified.
+     *)
     orig_commit_id : git_oid;
+    (**
+     * The path to the file where this hunk originated, as of the commit
+     * specified by `orig_commit_id`.
+     *)
     orig_path : PAnsiChar;
+    (**
+     * The 1-based line number where this hunk begins in the file named by
+     * `orig_path` in the commit specified by `orig_commit_id`.
+     *)
     orig_start_line_number : size_t;
+    (**
+     * The author of `orig_commit_id`. If `GIT_BLAME_USE_MAILMAP` has been
+     * specified, it will contain the canonical real name and email address.
+     *)
     orig_signature : Pgit_signature;
-    boundary : AnsiChar;
+    (**
+     * The 1 iff the hunk has been tracked to a boundary commit (the root,
+     * or the commit specified in git_blame_options.oldest_commit)
+     *)
+     boundary : AnsiChar;
   end;
 
 

src/git2/blob.inc

@@ -97,15 +97,20 @@ const
   (** When set, filters will not be applied to binary files.  *)
   GIT_BLOB_FILTER_CHECK_FOR_BINARY = ( 1 shl 0 );
   (**
-	 * When set, filters will not load configuration from the
-	 * system-wide `gitattributes` in `/etc` (or system equivalent).
-	  *)
+   * When set, filters will not load configuration from the
+   * system-wide `gitattributes` in `/etc` (or system equivalent).
+    *)
   GIT_BLOB_FILTER_NO_SYSTEM_ATTRIBUTES = ( 1 shl 1 );
   (**
-	 * When set, filters will be loaded from a `.gitattributes` file
-	 * in the HEAD commit.
-	  *)
+   * When set, filters will be loaded from a `.gitattributes` file
+   * in the HEAD commit.
+    *)
   GIT_BLOB_FILTER_ATTRIBUTES_FROM_HEAD = ( 1 shl 2 );
+  (**
+   * When set, filters will be loaded from a `.gitattributes` file
+   * in the specified commit.
+   *)
+  GIT_BLOB_FILTER_ATTRIBUTES_FROM_COMMIT = (1 shl 3);
 type
   git_blob_filter_flag_t = Integer;
 
@@ -121,6 +126,11 @@ type
     version : Integer;
     (** Flags to control the filtering process, see `git_blob_filter_flag_t` above  *)
     flags : uint32_t;
+    (**
+     * The commit to load attributes from, when
+     * `GIT_BLOB_FILTER_ATTRIBUTES_FROM_COMMIT` is specified.
+     *)
+    commit_id: Pgit_oid;
   end;
   Pgit_blob_filter_options = ^git_blob_filter_options;
 

src/git2/branch.inc

@@ -291,6 +291,20 @@ function git_branch_remote_name(out_: Pgit_buf; repo: Pgit_repository;
 function git_branch_upstream_remote(buf: Pgit_buf; repo: Pgit_repository;
   refname: PAnsiChar): Integer; cdecl; external libgit2_dll;
 
+(**
+ * Retrieve the upstream merge of a local branch
+ *
+ * This will return the currently configured "branch.*.merge" for a given
+ * branch. This branch must be local.
+ *
+ * @param buf the buffer into which to write the name
+ * @param repo the repository in which to look
+ * @param refname the full name of the branch
+ * @return 0 or an error code
+ *)
+ function git_branch_upstream_merge(buf: Pgit_buf; repo: Pgit_repository;
+   refname: PAnsiChar): Integer; cdecl; external libgit2_dll;
+
 (**
  * Determine whether a branch name is valid, meaning that (when prefixed
  * with `refs/heads/`) that it is a valid reference name, and that any
@@ -300,10 +314,9 @@ function git_branch_upstream_remote(buf: Pgit_buf; repo: Pgit_repository;
  * @param valid output pointer to set with validity of given branch name
  * @param name a branch name to test
  * @return 0 on success or an error code
-  *)
-
-function git_branch_name_is_valid(valid: PInteger; name_: PAnsiChar): Integer;
-  cdecl; external libgit2_dll;
+ *)
+ function git_branch_name_is_valid(valid: PInteger; name_: PAnsiChar): Integer;
+   cdecl; external libgit2_dll;
 
 (** @}  *)
 

src/git2/checkout.inc

@@ -161,18 +161,6 @@ type
  * Checkout will invoke an options notification callback (`notify_cb`) for
  * certain cases - you pick which ones via `notify_flags`:
  *
- * - GIT_CHECKOUT_NOTIFY_CONFLICT invokes checkout on conflicting paths.
- *
- * - GIT_CHECKOUT_NOTIFY_DIRTY notifies about "dirty" files, i.e. those that
- *   do not need an update but no longer match the baseline.  Core git
- *   displays these files when checkout runs, but won't stop the checkout.
- *
- * - GIT_CHECKOUT_NOTIFY_UPDATED sends notification for any file changed.
- *
- * - GIT_CHECKOUT_NOTIFY_UNTRACKED notifies about untracked files.
- *
- * - GIT_CHECKOUT_NOTIFY_IGNORED notifies about ignored files.
- *
  * Returning a non-zero value from this callback will cancel the checkout.
  * The non-zero return value will be propagated back and returned by the
  * git_checkout_... call.
@@ -184,10 +172,27 @@ type
 
 const
   GIT_CHECKOUT_NOTIFY_NONE = 0;
+  (**
+   * Invokes checkout on conflicting paths.
+   *)
   GIT_CHECKOUT_NOTIFY_CONFLICT = ( 1 shl 0 );
+  (**
+   * Notifies about "dirty" files, i.e. those that do not need an update
+   * but no longer match the baseline.  Core git displays these files when
+   * checkout runs, but won't stop the checkout.
+   *)
   GIT_CHECKOUT_NOTIFY_DIRTY = ( 1 shl 1 );
+  (**
+   * Sends notification for any file changed.
+   *)
   GIT_CHECKOUT_NOTIFY_UPDATED = ( 1 shl 2 );
+  (**
+   * Notifies about untracked files.
+   *)
   GIT_CHECKOUT_NOTIFY_UNTRACKED = ( 1 shl 3 );
+  (**
+   * Notifies about ignored files.
+   *)
   GIT_CHECKOUT_NOTIFY_IGNORED = ( 1 shl 4 );
   GIT_CHECKOUT_NOTIFY_ALL = $0FFFF;
 type