Most GitUp changes, rebased (2025-03-29)

This is a rebase of commit “GitUp. libgit2 updated. v1.3.0 (#7)” (72fd4af) on top of libgit2 v1.9.0.

This commit contains most of the GitUp libgit2 fork changes, squashed together. (list below)

* scripts: update-xcode has been added.

* gitignore: xcode and binaries folders have been excluded.

* submodule: submodule dup has been added.

* repository: repository update gitlink and repository local config path have been added.

* clone: clone into has been added.

* refs: reference create virtual and reference symbolic create virtual have been added.

* branch: upstream name and upstream remote and upstream merge have been added.

* cmake: gitup extensions have been added.

* diff: ctime and mtime have been added.

* streams: socket a 30 seconds timeout has been added.

* ssh: a 30 seconds timeout has been added.

* Pass current remote to git_push_negotiation callback. This makes it quite easier to implement the Git 'pre-push' hook.

* xpatience and indexer: struct entry has been renamed in favor of fmodules flag.

Author: lucasderraugh

.gitignore

@@ -6,3 +6,7 @@
 CMakeSettings.json
 .vs
 .idea
+
+#GitUp
+xcode
+binaries

deps/xdiff/xpatience.c

@@ -46,7 +46,7 @@
  */
 struct hashmap {
 	int nr, alloc;
-	struct entry {
+	struct xpatience_hashmap_entry {
 		unsigned long hash;
 		/*
 		 * 0 = unused entry, 1 = first line, 2 = second, etc.
@@ -59,7 +59,7 @@ struct hashmap {
 		 * sequence;
 		 * initially, "next" reflects only the order in file1.
 		 */
-		struct entry *next, *previous;
+		struct xpatience_hashmap_entry *next, *previous;
 
 		/*
 		 * If 1, this entry can serve as an anchor. See
@@ -165,8 +165,8 @@ static int fill_hashmap(xpparam_t const *xpp, xdfenv_t *env,
  * Find the longest sequence with a smaller last element (meaning a smaller
  * line2, as we construct the sequence with entries ordered by line1).
  */
-static int binary_search(struct entry **sequence, int longest,
-		struct entry *entry)
+static int binary_search(struct xpatience_hashmap_entry **sequence, int longest,
+		struct xpatience_hashmap_entry *entry)
 {
 	int left = -1, right = longest;
 
@@ -191,11 +191,11 @@ static int binary_search(struct entry **sequence, int longest,
  * item per sequence length: the sequence with the smallest last
  * element (in terms of line2).
  */
-static int find_longest_common_sequence(struct hashmap *map, struct entry **res)
+static int find_longest_common_sequence(struct hashmap *map, struct xpatience_hashmap_entry **res)
 {
-	struct entry **sequence;
+	struct xpatience_hashmap_entry **sequence;
 	int longest = 0, i;
-	struct entry *entry;
+	struct xpatience_hashmap_entry *entry;
 
 	/*
 	 * If not -1, this entry in sequence must never be overridden.
@@ -253,7 +253,7 @@ static int match(struct hashmap *map, int line1, int line2)
 static int patience_diff(xpparam_t const *xpp, xdfenv_t *env,
 		int line1, int count1, int line2, int count2);
 
-static int walk_common_sequence(struct hashmap *map, struct entry *first,
+static int walk_common_sequence(struct hashmap *map, struct xpatience_hashmap_entry *first,
 		int line1, int count1, int line2, int count2)
 {
 	int end1 = line1 + count1, end2 = line2 + count2;
@@ -324,7 +324,7 @@ static int patience_diff(xpparam_t const *xpp, xdfenv_t *env,
 		int line1, int count1, int line2, int count2)
 {
 	struct hashmap map;
-	struct entry *first;
+	struct xpatience_hashmap_entry *first;
 	int result = 0;
 
 	/* trivial case: one side is empty */

include/git2/diff.h

@@ -279,6 +279,11 @@ typedef struct {
 	 * abbreviated to something reasonable, like 7 characters.
 	 */
 	uint16_t           id_abbrev;
+    
+    /// Use later GIT_EXTERN(const git_index_entry *) git_index_get_bypath(git_index *index, const char *path, int stage);
+    /// PATCH
+    git_time_t         ctime;
+    git_time_t         mtime;
 } git_diff_file;
 
 /**

include/git2/gitup_branch.h

@@ -0,0 +1,24 @@
+#include "common.h"
+#include "oid.h"
+#include "types.h"
+#include "branch.h"
+
+/**
+ * @file git2/branch.h
+ * @brief Git branch parsing routines
+ * @defgroup git_branch Git branch management
+ * @ingroup Git
+ * @{
+ */
+
+GIT_BEGIN_DECL
+// PATCH
+// These functions are aliases and can be safely removed.
+// Use `git_#{func}` instead.
+// Replace and remove this file later.
+GIT_EXTERN(int) gitup_branch_upstream_name(git_buf *out, git_repository *repo, const char *refname);
+GIT_EXTERN(int) gitup_branch_upstream_remote(git_buf *buf, git_repository *repo, const char *refname);
+GIT_EXTERN(int) gitup_branch_upstream_merge(git_buf *buf, git_repository *repo, const char *refname);
+
+/** @} */
+GIT_END_DECL

include/git2/gitup_clone.h

@@ -0,0 +1,65 @@
+#include "clone.h"
+#include "common.h"
+#include "types.h"
+#include "indexer.h"
+#include "checkout.h"
+#include "remote.h"
+#include "transport.h"
+
+/**
+ * @file git2/clone.h
+ * @brief Git cloning routines
+ * @defgroup git_clone Git cloning routines
+ * @ingroup Git
+ * @{
+ */
+GIT_BEGIN_DECL
+
+/**
+ * Clone a remote repository.
+ *
+ * By default this creates its repository and initial remote to match
+ * git's defaults. You can use the options in the callback to
+ * customize how these are created.
+ *
+ * @param out pointer that will receive the resulting repository object
+ * @param url the remote repository to clone
+ * @param local_path local directory to clone to
+ * @param options configuration options for the clone.  If NULL, the
+ *        function works as though GIT_OPTIONS_INIT were passed.
+ * @return 0 on success, any non-zero return value from a callback
+ *         function, or a negative value to indicate an error (use
+ *         `git_error_last` for a detailed error message)
+ */
+
+/// Use `git_clone instead.
+GIT_EXTERN(int) gitup_clone_into(
+	git_repository **out,
+	const char *url,
+	const char *local_path,
+	const git_clone_options *options
+	);
+
+/// Deprecated
+/**
+ * Clone a remote repository into an existing empty repository using
+ * a pre-existing remote.
+ *
+ * @param repo the repository to clone into
+ * @param remote the remote to use for cloning
+ * @param fetch_opts the fetch options to use
+ * @param checkout_opts the checkout options to use
+ * @param branch name of the branch to checkout (NULL means use the
+ *        remote's default branch)
+ * @return 0 on success, any non-zero return value from a callback
+ *         function, or a negative value to indicate an error
+ */
+GIT_EXTERN(int) gitup_clone_into_old(
+	git_repository *repo,
+	git_remote *remote,
+	const git_fetch_options *fetch_opts,
+	const git_checkout_options *checkout_opts,
+	const char *branch);
+
+/** @} */
+GIT_END_DECL

include/git2/gitup_config.h

@@ -0,0 +1,19 @@
+#include "config.h"
+
+GIT_BEGIN_DECL
+
+/**
+ * Locate the path to the local configuration file
+ *
+ * The returned path may be used on any `git_config` call to load the local
+ * configuration file.
+ *
+ * @param repo The repository whose local configuration file to find
+ * @param out Pointer to a user-allocated git_buf in which to store the path
+ * @return 0 if a local configuration file has been found. Its path will be stored in `out`.
+ */
+/// This function uses repository method item path.
+/// Maybe it is better to use `repository` method `gitup_repository_find_local_config`
+GIT_EXTERN(int) gitup_config_find_local(git_repository *repo, git_buf *out);
+
+GIT_END_DECL

include/git2/gitup_refs.h

@@ -0,0 +1,35 @@
+#include "refs.h"
+
+GIT_BEGIN_DECL
+
+/**
+ * Create a virtual direct reference.
+ * 
+ * This is wrapper for
+ * git_reference_create(git_reference **out, git_repository *repo, const char *name, const git_oid *id, int force, const char *log_message);
+ *
+ * @param out Pointer to the newly created reference
+ * @param repo Repository where that reference virtually lives
+ * @param name The name of the reference
+ * @param id The object id pointed to by the reference
+ * @return 0 on success or an error code
+ */
+GIT_EXTERN(int) gitup_reference_create_virtual(git_reference **out, git_repository *repo, const char *name, const git_oid *id);
+
+/**
+ * Create a virtual symbolic reference.
+ * 
+ * Discussion
+ * 
+ * This is a wrapper for
+ * git_reference_symbolic_create(git_reference **out, git_repository *repo, const char *name, const char *target, int force, const char *log_message);
+ *
+ * @param out Pointer to the newly created reference
+ * @param repo Repository where that reference virtually lives
+ * @param name The name of the reference
+ * @param target The target of the reference
+ * @return 0 on success or an error code
+ */
+GIT_EXTERN(int) gitup_reference_symbolic_create_virtual(git_reference **out, git_repository *repo, const char *name, const char *target);
+
+GIT_END_DECL

include/git2/gitup_repository.h

@@ -0,0 +1,35 @@
+#include "repository.h"
+#include "common.h"
+#include "types.h"
+#include "oid.h"
+#include "buffer.h"
+
+/**
+ * @file git2/gitup_repository.h
+ * @brief Git repository management routines
+ * @defgroup git_repository Git repository management routines
+ * @ingroup Git
+ * @{
+ */
+GIT_BEGIN_DECL
+
+/**
+ * Update or rewrite the gitlink in the workdir
+ */
+GIT_EXTERN(int) gitup_repository_update_gitlink(
+    git_repository *repo, int use_relative_path);
+
+/**
+ * Locate the path to the local configuration file
+ *
+ * The returned path may be used on any `git_config` call to load the local
+ * configuration file.
+ *
+ * @param repo The repository whose local configuration file to find
+ * @param out Pointer to a user-allocated git_buf in which to store the path
+ * @return 0 if a local configuration file has been found. Its path will be stored in `out`.
+ */
+GIT_EXTERN(int) gitup_repository_local_config_path(git_buf *out, git_repository *repo);
+
+/** @} */
+GIT_END_DECL

include/git2/gitup_submodule.h

@@ -0,0 +1,12 @@
+#include "submodule.h"
+
+GIT_BEGIN_DECL
+
+/**
+ * Retains a submodule
+ *
+ * @param submodule Submodule object
+ */
+GIT_EXTERN(void) gitup_submodule_dup(git_submodule *submodule);
+
+GIT_END_DECL

include/git2/remote.h

@@ -511,11 +511,13 @@ typedef struct {
  *
  * @param updates an array containing the updates which will be sent
  * as commands to the destination.
+ * @param the remote being pushed /// PATCH
  * @param len number of elements in `updates`
  * @param payload Payload provided by the caller
  * @return 0 or an error code to stop the push
  */
 typedef int GIT_CALLBACK(git_push_negotiation)(
+	git_remote *remote,
 	const git_push_update **updates,
 	size_t len,
 	void *payload);