2015-01-23 03:40:01 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <time.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <git2.h>
|
|
|
|
|
|
|
|
#include "dive.h"
|
2015-02-08 18:35:25 +00:00
|
|
|
#include "membuffer.h"
|
2015-06-01 06:12:30 +00:00
|
|
|
#include "strndup.h"
|
2015-06-12 13:45:56 +00:00
|
|
|
#include "qthelperfromc.h"
|
2015-06-13 15:01:06 +00:00
|
|
|
#include "git-access.h"
|
2015-06-13 16:12:16 +00:00
|
|
|
#include "gettext.h"
|
2015-02-08 18:35:25 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The libgit2 people are incompetent at making libraries. They randomly change
|
|
|
|
* the interfaces, often just renaming things without any sane way to know which
|
|
|
|
* version you should check for etc etc. It's a disgrace.
|
|
|
|
*/
|
|
|
|
#if !LIBGIT2_VER_MAJOR && LIBGIT2_VER_MINOR < 22
|
|
|
|
#define git_remote_lookup(res, repo, name) git_remote_load(res, repo, name)
|
2015-02-24 07:49:46 +00:00
|
|
|
#if LIBGIT2_VER_MINOR <= 20
|
|
|
|
#define git_remote_fetch(remote, refspecs, signature, reflog) git_remote_fetch(remote)
|
|
|
|
#else
|
|
|
|
#define git_remote_fetch(remote, refspecs, signature, reflog) git_remote_fetch(remote, signature, reflog)
|
|
|
|
#endif
|
2015-02-08 18:35:25 +00:00
|
|
|
#endif
|
2015-06-15 03:02:42 +00:00
|
|
|
|
|
|
|
#if !USE_LIBGIT23_API && !LIBGIT2_VER_MAJOR && LIBGIT2_VER_MINOR == 22
|
|
|
|
#define git_remote_push(remote,refspecs,opts) git_remote_push(remote,refspecs,opts,NULL,NULL)
|
|
|
|
#define git_reference_set_target(out,ref,id,log_message) git_reference_set_target(out,ref,id,NULL,log_message)
|
|
|
|
#define git_reset(repo,target,reset_type,checkout_opts) git_reset(repo,target,reset_type,checkout_opts,NULL,NULL)
|
|
|
|
#endif
|
|
|
|
|
2015-05-28 16:13:51 +00:00
|
|
|
/*
|
|
|
|
* api break introduced in libgit2 master after 0.22 - let's guess this is the v0.23 API
|
|
|
|
*/
|
2015-08-24 01:14:27 +00:00
|
|
|
#if USE_LIBGIT23_API || (!LIBGIT2_VER_MAJOR && LIBGIT2_VER_MINOR >= 23)
|
2015-05-28 16:13:51 +00:00
|
|
|
#define git_branch_create(out, repo, branch_name, target, force, signature, log_message) \
|
|
|
|
git_branch_create(out, repo, branch_name, target, force)
|
|
|
|
#endif
|
2015-02-08 18:35:25 +00:00
|
|
|
|
|
|
|
static char *get_local_dir(const char *remote, const char *branch)
|
|
|
|
{
|
|
|
|
SHA_CTX ctx;
|
|
|
|
unsigned char hash[20];
|
|
|
|
|
|
|
|
// That zero-byte update is so that we don't get hash
|
|
|
|
// collisions for "repo1 branch" vs "repo 1branch".
|
|
|
|
SHA1_Init(&ctx);
|
|
|
|
SHA1_Update(&ctx, remote, strlen(remote));
|
|
|
|
SHA1_Update(&ctx, "", 1);
|
|
|
|
SHA1_Update(&ctx, branch, strlen(branch));
|
|
|
|
SHA1_Final(hash, &ctx);
|
|
|
|
|
|
|
|
return format_string("%s/%02x%02x%02x%02x%02x%02x%02x%02x",
|
2015-02-15 19:55:52 +00:00
|
|
|
system_default_directory(),
|
2015-02-08 18:35:25 +00:00
|
|
|
hash[0], hash[1], hash[2], hash[3],
|
|
|
|
hash[4], hash[5], hash[6], hash[7]);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int check_clean(const char *path, unsigned int status, void *payload)
|
|
|
|
{
|
|
|
|
status &= ~GIT_STATUS_CURRENT | GIT_STATUS_IGNORED;
|
|
|
|
if (!status)
|
|
|
|
return 0;
|
2015-08-23 18:29:49 +00:00
|
|
|
report_error("WARNING: Git cache directory modified (path %s) status %0x", path, status);
|
2015-02-08 18:35:25 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2015-06-10 20:37:22 +00:00
|
|
|
/*
|
|
|
|
* The remote is strictly newer than the local branch.
|
|
|
|
*/
|
|
|
|
static int reset_to_remote(git_repository *repo, git_reference *local, const git_oid *new_id)
|
2015-02-08 18:35:25 +00:00
|
|
|
{
|
2015-06-10 20:37:22 +00:00
|
|
|
git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
|
|
|
|
git_object *target;
|
|
|
|
|
|
|
|
// If it's not checked out (bare or not HEAD), just update the reference */
|
|
|
|
if (git_repository_is_bare(repo) || git_branch_is_head(local) != 1) {
|
|
|
|
git_reference *out;
|
|
|
|
|
|
|
|
if (git_reference_set_target(&out, local, new_id, "Update to remote"))
|
|
|
|
return report_error("Could not update local ref to newer remote ref");
|
|
|
|
|
|
|
|
git_reference_free(out);
|
|
|
|
|
|
|
|
// Not really an error, just informational
|
|
|
|
report_error("Updated local branch from remote");
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (git_object_lookup(&target, repo, new_id, GIT_OBJ_COMMIT))
|
|
|
|
return report_error("Could not look up remote commit");
|
|
|
|
|
|
|
|
opts.checkout_strategy = GIT_CHECKOUT_SAFE;
|
|
|
|
if (git_reset(repo, target, GIT_RESET_HARD, &opts))
|
|
|
|
return report_error("Local head checkout failed after update");
|
|
|
|
|
|
|
|
// Not really an error, just informational
|
|
|
|
report_error("Updated local information from remote");
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-06-11 04:54:42 +00:00
|
|
|
#if USE_LIBGIT23_API
|
|
|
|
int credential_ssh_cb(git_cred **out,
|
|
|
|
const char *url,
|
|
|
|
const char *username_from_url,
|
|
|
|
unsigned int allowed_types,
|
|
|
|
void *payload)
|
|
|
|
{
|
|
|
|
const char *priv_key = format_string("%s/%s", system_default_directory(), "ssrf_remote.key");
|
|
|
|
const char *passphrase = prefs.cloud_storage_password ? strdup(prefs.cloud_storage_password) : strdup("");
|
|
|
|
return git_cred_ssh_key_new(out, username_from_url, NULL, priv_key, passphrase);
|
|
|
|
}
|
|
|
|
|
|
|
|
int credential_https_cb(git_cred **out,
|
|
|
|
const char *url,
|
|
|
|
const char *username_from_url,
|
|
|
|
unsigned int allowed_types,
|
|
|
|
void *payload)
|
|
|
|
{
|
|
|
|
const char *username = prefs.cloud_storage_email_encoded;
|
|
|
|
const char *password = prefs.cloud_storage_password ? strdup(prefs.cloud_storage_password) : strdup("");
|
|
|
|
return git_cred_userpass_plaintext_new(out, username, password);
|
|
|
|
}
|
2015-07-13 18:20:18 +00:00
|
|
|
|
|
|
|
#define KNOWN_CERT "\xfd\xb8\xf7\x73\x76\xe2\x75\x53\x93\x37\xdc\xfe\x1e\x55\x43\x3d\xf2\x2c\x18\x2c"
|
|
|
|
int certificate_check_cb(git_cert *cert, int valid, const char *host, void *payload)
|
|
|
|
{
|
|
|
|
if (same_string(host, "cloud.subsurface-divelog.org") && cert->cert_type == GIT_CERT_X509) {
|
|
|
|
SHA_CTX ctx;
|
|
|
|
unsigned char hash[21];
|
|
|
|
git_cert_x509 *cert509 = (git_cert_x509 *)cert;
|
|
|
|
SHA1_Init(&ctx);
|
|
|
|
SHA1_Update(&ctx, cert509->data, cert509->len);
|
|
|
|
SHA1_Final(hash, &ctx);
|
|
|
|
hash[20] = 0;
|
2015-08-17 16:29:21 +00:00
|
|
|
if (same_string((char *)hash, KNOWN_CERT)) {
|
2015-07-13 18:20:18 +00:00
|
|
|
fprintf(stderr, "cloud certificate considered %s, forcing it valid\n",
|
|
|
|
valid ? "valid" : "not valid");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return valid;
|
|
|
|
}
|
|
|
|
|
2015-06-11 04:54:42 +00:00
|
|
|
#endif
|
|
|
|
|
2015-06-13 15:01:06 +00:00
|
|
|
static int update_remote(git_repository *repo, git_remote *origin, git_reference *local, git_reference *remote, enum remote_transport rt)
|
2015-06-11 00:18:44 +00:00
|
|
|
{
|
git storage: actually update the remote repository if the local cache is more recent
Again, note that this currently only happens when you initially open the repository.
So if you do
subsurface https://.../repo[myubranch]
it will start up by fetching the remote information, and updating the
local cache. If you then download new dives, and do a save-and-exit, it
will save to the local cache, but it doesn't do the fetch at this point,
so the remote is now begind.
The *next* time you start subsurface, and load that git branch again, it
will fetch the remote, and now notice that the local cache is ahead of
it (because you downloaded new dives and saved them locally), and *then*
it will try to update the remote with the new information.
This is obviously bogus, but we will need to decide exactly how we want
to sync with the remote repository. But now the core functionality is
there, it's just that we need some interface to say "sync now".
Especially in the face of spotty (or non-working) internet, you want a
GUI etc for this whole remote sync, rather than doing it unconditionally
and silently whenever you load the local cache initially.
With that caveat:
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-06-11 01:03:37 +00:00
|
|
|
git_push_options opts = GIT_PUSH_OPTIONS_INIT;
|
|
|
|
git_strarray refspec;
|
|
|
|
const char *name = git_reference_name(local);
|
|
|
|
|
|
|
|
refspec.count = 1;
|
|
|
|
refspec.strings = (char **)&name;
|
|
|
|
|
2015-06-11 04:55:19 +00:00
|
|
|
#if USE_LIBGIT23_API
|
2015-06-13 15:01:06 +00:00
|
|
|
if (rt == RT_SSH)
|
2015-06-11 04:55:19 +00:00
|
|
|
opts.callbacks.credentials = credential_ssh_cb;
|
2015-06-13 15:01:06 +00:00
|
|
|
else if (rt == RT_HTTPS)
|
2015-06-11 04:55:19 +00:00
|
|
|
opts.callbacks.credentials = credential_https_cb;
|
2015-07-13 18:20:18 +00:00
|
|
|
opts.callbacks.certificate_check = certificate_check_cb;
|
2015-06-11 04:55:19 +00:00
|
|
|
#endif
|
git storage: actually update the remote repository if the local cache is more recent
Again, note that this currently only happens when you initially open the repository.
So if you do
subsurface https://.../repo[myubranch]
it will start up by fetching the remote information, and updating the
local cache. If you then download new dives, and do a save-and-exit, it
will save to the local cache, but it doesn't do the fetch at this point,
so the remote is now begind.
The *next* time you start subsurface, and load that git branch again, it
will fetch the remote, and now notice that the local cache is ahead of
it (because you downloaded new dives and saved them locally), and *then*
it will try to update the remote with the new information.
This is obviously bogus, but we will need to decide exactly how we want
to sync with the remote repository. But now the core functionality is
there, it's just that we need some interface to say "sync now".
Especially in the face of spotty (or non-working) internet, you want a
GUI etc for this whole remote sync, rather than doing it unconditionally
and silently whenever you load the local cache initially.
With that caveat:
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-06-11 01:03:37 +00:00
|
|
|
if (git_remote_push(origin, &refspec, &opts))
|
|
|
|
return report_error("Unable to update remote with current local cache state (%s)", giterr_last()->message);
|
|
|
|
|
2015-06-11 00:18:44 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-08-23 18:32:14 +00:00
|
|
|
extern int update_git_checkout(git_repository *repo, git_object *parent, git_tree *tree);
|
|
|
|
|
|
|
|
static int try_to_git_merge(git_repository *repo, git_reference *local, git_reference *remote, git_oid *base, const git_oid *local_id, const git_oid *remote_id)
|
|
|
|
{
|
|
|
|
git_tree *local_tree, *remote_tree, *base_tree;
|
|
|
|
git_commit *local_commit, *remote_commit, *base_commit;
|
|
|
|
git_index *merged_index;
|
|
|
|
git_merge_options merge_options;
|
|
|
|
git_merge_init_options(&merge_options, GIT_MERGE_OPTIONS_VERSION);
|
|
|
|
merge_options.tree_flags = GIT_MERGE_TREE_FIND_RENAMES;
|
|
|
|
merge_options.file_favor = GIT_MERGE_FILE_FAVOR_UNION;
|
2015-08-24 01:15:33 +00:00
|
|
|
merge_options.rename_threshold = 100;
|
2015-08-23 18:32:14 +00:00
|
|
|
if (git_commit_lookup(&local_commit, repo, local_id))
|
|
|
|
return report_error(translate("gettextFromC", "Remote storage and local data diverged. Error: can't get commit (%s)"), giterr_last()->message);
|
|
|
|
if (git_commit_tree(&local_tree, local_commit))
|
|
|
|
return report_error(translate("gettextFromC", "Remote storage and local data diverged. Error: failed local tree lookup (%s)"), giterr_last()->message);
|
|
|
|
if (git_commit_lookup(&remote_commit, repo, remote_id))
|
|
|
|
return report_error(translate("gettextFromC", "Remote storage and local data diverged. Error: can't get commit (%s)"), giterr_last()->message);
|
|
|
|
if (git_commit_tree(&remote_tree, remote_commit))
|
|
|
|
return report_error(translate("gettextFromC", "Remote storage and local data diverged. Error: failed remote tree lookup (%s)"), giterr_last()->message);
|
|
|
|
if (git_commit_lookup(&base_commit, repo, base))
|
|
|
|
return report_error(translate("gettextFromC", "Remote storage and local data diverged. Error: can't get commit: (%s)"), giterr_last()->message);
|
|
|
|
if (git_commit_tree(&base_tree, base_commit))
|
|
|
|
return report_error(translate("gettextFromC", "Remote storage and local data diverged. Error: failed base tree lookup: (%s)"), giterr_last()->message);
|
|
|
|
if (git_merge_trees(&merged_index, repo, base_tree, local_tree, remote_tree, &merge_options))
|
|
|
|
return report_error(translate("gettextFromC", "Remote storage and local data diverged. Error: merge failed (%s)"), giterr_last()->message);
|
|
|
|
if (git_index_has_conflicts(merged_index)) {
|
|
|
|
return report_error(translate("gettextFromC", "Remote storage and local data diverged. Error: merge conflict - manual intervention needed"));
|
|
|
|
} else {
|
|
|
|
git_oid merge_oid, commit_oid;
|
|
|
|
git_tree *merged_tree;
|
|
|
|
git_signature *author;
|
|
|
|
git_commit *commit;
|
|
|
|
|
|
|
|
if (git_index_write_tree_to(&merge_oid, merged_index, repo))
|
|
|
|
return report_error(translate("gettextFromC", "Remote storage and local data diverged. Error: writing the tree failed (%s)"), giterr_last()->message);
|
|
|
|
if (git_tree_lookup(&merged_tree, repo, &merge_oid))
|
|
|
|
return report_error(translate("gettextFromC", "Remote storage and local data diverged. Error: tree lookup failed (%s)"), giterr_last()->message);
|
|
|
|
if (git_signature_default(&author, repo) < 0)
|
|
|
|
return report_error(translate("gettextFromC", "Failed to get author: (%s)"), giterr_last()->message);
|
|
|
|
if (git_commit_create_v(&commit_oid, repo, "HEAD", author, author, NULL, "automatic merge", merged_tree, 2, local_commit, remote_commit))
|
|
|
|
return report_error(translate("gettextFromC", "Remote storage and local data diverged. Error: git commit create failed (%s)"), giterr_last()->message);
|
2015-08-23 18:33:15 +00:00
|
|
|
if (git_commit_lookup(&commit, repo, &commit_oid))
|
|
|
|
return report_error(translate("gettextFromC", "Error: could not lookup the merge commit I just created (%s)"), giterr_last()->message);
|
|
|
|
if (git_branch_is_head(local) && !git_repository_is_bare(repo)) {
|
|
|
|
git_object *parent;
|
|
|
|
git_reference_peel(&parent, local, GIT_OBJ_COMMIT);
|
|
|
|
if (update_git_checkout(repo, parent, merged_tree)) {
|
|
|
|
report_error("Warning: checked out branch is inconsistent with git data");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (git_reference_set_target(&local, local, &commit_oid, "Subsurface merge event"))
|
|
|
|
return report_error("Error: failed to update branch (%s)", giterr_last()->message);
|
|
|
|
set_git_id(&commit_oid);
|
|
|
|
git_signature_free(author);
|
2015-08-23 18:32:14 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-06-13 15:01:06 +00:00
|
|
|
static int try_to_update(git_repository *repo, git_remote *origin, git_reference *local, git_reference *remote, enum remote_transport rt)
|
2015-06-10 20:37:22 +00:00
|
|
|
{
|
|
|
|
git_oid base;
|
|
|
|
const git_oid *local_id, *remote_id;
|
|
|
|
|
2015-02-08 18:35:25 +00:00
|
|
|
if (!git_reference_cmp(local, remote))
|
|
|
|
return 0;
|
2015-06-10 20:37:22 +00:00
|
|
|
|
2015-06-11 00:18:44 +00:00
|
|
|
// Dirty modified state in the working tree? We're not going
|
|
|
|
// to update either way
|
|
|
|
if (git_status_foreach(repo, check_clean, NULL))
|
|
|
|
return report_error("local cached copy is dirty, skipping update");
|
|
|
|
|
2015-06-10 20:37:22 +00:00
|
|
|
local_id = git_reference_target(local);
|
|
|
|
remote_id = git_reference_target(remote);
|
|
|
|
|
|
|
|
if (!local_id || !remote_id)
|
|
|
|
return report_error("Unable to get local or remote SHA1");
|
|
|
|
|
|
|
|
if (git_merge_base(&base, repo, local_id, remote_id))
|
|
|
|
return report_error("Unable to find common commit of local and remote branches");
|
|
|
|
|
|
|
|
/* Is the remote strictly newer? Use it */
|
|
|
|
if (git_oid_equal(&base, local_id))
|
|
|
|
return reset_to_remote(repo, local, remote_id);
|
|
|
|
|
2015-06-11 00:18:44 +00:00
|
|
|
/* Is the local repo the more recent one? See if we can update upstream */
|
|
|
|
if (git_oid_equal(&base, remote_id))
|
2015-06-11 04:52:33 +00:00
|
|
|
return update_remote(repo, origin, local, remote, rt);
|
2015-06-10 20:37:22 +00:00
|
|
|
|
|
|
|
/* Merging a bare repository always needs user action */
|
|
|
|
if (git_repository_is_bare(repo))
|
|
|
|
return report_error("Local and remote have diverged, merge of bare branch needed");
|
|
|
|
|
|
|
|
/* Merging will definitely need the head branch too */
|
|
|
|
if (git_branch_is_head(local) != 1)
|
|
|
|
return report_error("Local and remote do not match, local branch not HEAD - cannot update");
|
|
|
|
|
2015-08-21 05:23:12 +00:00
|
|
|
/* Ok, let's try to merge these */
|
2015-08-23 18:32:14 +00:00
|
|
|
return try_to_git_merge(repo, local, remote, &base, local_id, remote_id);
|
2015-02-08 18:35:25 +00:00
|
|
|
}
|
|
|
|
|
2015-06-13 15:01:06 +00:00
|
|
|
static int check_remote_status(git_repository *repo, git_remote *origin, const char *branch, enum remote_transport rt)
|
2015-06-11 00:18:44 +00:00
|
|
|
{
|
2015-06-14 03:03:20 +00:00
|
|
|
int error = 0;
|
|
|
|
|
2015-06-11 00:18:44 +00:00
|
|
|
git_reference *local_ref, *remote_ref;
|
|
|
|
|
|
|
|
if (git_branch_lookup(&local_ref, repo, branch, GIT_BRANCH_LOCAL))
|
|
|
|
return report_error("Git cache branch %s no longer exists", branch);
|
|
|
|
|
|
|
|
if (git_branch_upstream(&remote_ref, local_ref)) {
|
2015-06-14 01:31:27 +00:00
|
|
|
/* so there is no upstream branch for our branch; that's a problem.
|
2015-06-22 03:02:01 +00:00
|
|
|
* let's push our branch */
|
2015-06-14 01:31:27 +00:00
|
|
|
git_strarray refspec;
|
|
|
|
git_reference_list(&refspec, repo);
|
|
|
|
#if USE_LIBGIT23_API
|
|
|
|
git_push_options opts = GIT_PUSH_OPTIONS_INIT;
|
|
|
|
if (rt == RT_SSH)
|
|
|
|
opts.callbacks.credentials = credential_ssh_cb;
|
|
|
|
else if (rt == RT_HTTPS)
|
|
|
|
opts.callbacks.credentials = credential_https_cb;
|
2015-07-13 18:20:18 +00:00
|
|
|
opts.callbacks.certificate_check = certificate_check_cb;
|
2015-06-14 03:03:20 +00:00
|
|
|
error = git_remote_push(origin, &refspec, &opts);
|
2015-06-14 01:31:27 +00:00
|
|
|
#else
|
2015-06-14 03:03:20 +00:00
|
|
|
error = git_remote_push(origin, &refspec, NULL);
|
2015-06-14 01:31:27 +00:00
|
|
|
#endif
|
|
|
|
} else {
|
2015-06-14 03:03:20 +00:00
|
|
|
error = try_to_update(repo, origin, local_ref, remote_ref, rt);
|
2015-06-14 01:31:27 +00:00
|
|
|
git_reference_free(remote_ref);
|
2015-06-11 00:18:44 +00:00
|
|
|
}
|
|
|
|
git_reference_free(local_ref);
|
2015-06-14 03:03:20 +00:00
|
|
|
return error;
|
2015-06-11 00:18:44 +00:00
|
|
|
}
|
|
|
|
|
2015-06-13 15:01:06 +00:00
|
|
|
int sync_with_remote(git_repository *repo, const char *remote, const char *branch, enum remote_transport rt)
|
2015-02-08 18:35:25 +00:00
|
|
|
{
|
|
|
|
int error;
|
|
|
|
git_remote *origin;
|
2015-06-12 13:24:48 +00:00
|
|
|
char *proxy_string;
|
|
|
|
git_config *conf;
|
2015-02-08 18:35:25 +00:00
|
|
|
|
2015-06-12 13:29:22 +00:00
|
|
|
git_repository_config(&conf, repo);
|
2015-06-13 15:01:06 +00:00
|
|
|
if (rt == RT_HTTPS && getProxyString(&proxy_string)) {
|
2015-06-12 13:24:48 +00:00
|
|
|
git_config_set_string(conf, "http.proxy", proxy_string);
|
|
|
|
free(proxy_string);
|
2015-06-12 13:29:22 +00:00
|
|
|
} else {
|
|
|
|
git_config_set_string(conf, "http.proxy", "");
|
2015-06-12 13:24:48 +00:00
|
|
|
}
|
2015-06-12 13:29:22 +00:00
|
|
|
|
2015-02-08 18:35:25 +00:00
|
|
|
/*
|
|
|
|
* NOTE! Remote errors are reported, but are nonfatal:
|
|
|
|
* we still successfully return the local repository.
|
|
|
|
*/
|
|
|
|
error = git_remote_lookup(&origin, repo, "origin");
|
|
|
|
if (error) {
|
|
|
|
report_error("Repository '%s' origin lookup failed (%s)",
|
|
|
|
remote, giterr_last()->message);
|
2015-06-12 19:32:12 +00:00
|
|
|
return 0;
|
2015-02-08 18:35:25 +00:00
|
|
|
}
|
|
|
|
|
2015-06-16 19:42:17 +00:00
|
|
|
if (rt == RT_HTTPS && !canReachCloudServer()) {
|
|
|
|
// this is not an error, just a warning message, so return 0
|
|
|
|
report_error("Cannot connect to cloud server, working with local copy");
|
2015-06-12 19:32:12 +00:00
|
|
|
return 0;
|
2015-06-16 19:42:17 +00:00
|
|
|
}
|
2015-05-28 23:09:29 +00:00
|
|
|
#if USE_LIBGIT23_API
|
2015-05-29 04:43:32 +00:00
|
|
|
git_fetch_options opts = GIT_FETCH_OPTIONS_INIT;
|
2015-06-13 15:01:06 +00:00
|
|
|
if (rt == RT_SSH)
|
2015-06-01 00:15:58 +00:00
|
|
|
opts.callbacks.credentials = credential_ssh_cb;
|
2015-06-13 15:01:06 +00:00
|
|
|
else if (rt == RT_HTTPS)
|
2015-06-01 00:15:58 +00:00
|
|
|
opts.callbacks.credentials = credential_https_cb;
|
2015-07-13 18:20:18 +00:00
|
|
|
opts.callbacks.certificate_check = certificate_check_cb;
|
2015-05-28 19:03:51 +00:00
|
|
|
error = git_remote_fetch(origin, NULL, &opts, NULL);
|
2015-05-29 04:43:32 +00:00
|
|
|
#else
|
|
|
|
error = git_remote_fetch(origin, NULL, NULL, NULL);
|
|
|
|
#endif
|
2015-06-11 04:52:33 +00:00
|
|
|
// NOTE! A fetch error is not fatal, we just report it
|
2015-06-14 03:03:20 +00:00
|
|
|
if (error) {
|
2015-06-11 00:18:44 +00:00
|
|
|
report_error("Unable to fetch remote '%s'", remote);
|
2015-06-14 03:03:20 +00:00
|
|
|
error = 0;
|
|
|
|
} else {
|
|
|
|
error = check_remote_status(repo, origin, branch, rt);
|
|
|
|
}
|
2015-06-11 00:18:44 +00:00
|
|
|
git_remote_free(origin);
|
2015-06-14 03:03:20 +00:00
|
|
|
return error;
|
2015-06-12 19:32:12 +00:00
|
|
|
}
|
|
|
|
|
2015-06-13 15:01:06 +00:00
|
|
|
static git_repository *update_local_repo(const char *localdir, const char *remote, const char *branch, enum remote_transport rt)
|
2015-06-12 19:32:12 +00:00
|
|
|
{
|
|
|
|
int error;
|
|
|
|
git_repository *repo = NULL;
|
|
|
|
|
|
|
|
error = git_repository_open(&repo, localdir);
|
|
|
|
if (error) {
|
|
|
|
report_error("Unable to open git cache repository at %s: %s",
|
|
|
|
localdir, giterr_last()->message);
|
|
|
|
return NULL;
|
|
|
|
}
|
2015-06-13 15:01:06 +00:00
|
|
|
sync_with_remote(repo, remote, branch, rt);
|
2015-02-08 18:35:25 +00:00
|
|
|
return repo;
|
|
|
|
}
|
|
|
|
|
2015-06-13 16:13:08 +00:00
|
|
|
static int repository_create_cb(git_repository **out, const char *path, int bare, void *payload)
|
|
|
|
{
|
|
|
|
char *proxy_string;
|
|
|
|
git_config *conf;
|
|
|
|
|
|
|
|
int ret = git_repository_init(out, path, bare);
|
|
|
|
|
|
|
|
if (getProxyString(&proxy_string)) {
|
|
|
|
git_repository_config(&conf, *out);
|
|
|
|
git_config_set_string(conf, "http.proxy", proxy_string);
|
|
|
|
free(proxy_string);
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2015-06-14 01:33:12 +00:00
|
|
|
/* this should correctly initialize both the local and remote
|
|
|
|
* repository for the Subsurface cloud storage */
|
|
|
|
static git_repository *create_and_push_remote(const char *localdir, const char *remote, const char *branch)
|
|
|
|
{
|
|
|
|
git_repository *repo;
|
|
|
|
git_config *conf;
|
|
|
|
int len;
|
|
|
|
char *variable_name, *merge_head;
|
|
|
|
|
|
|
|
/* first make sure the directory for the local cache exists */
|
|
|
|
subsurface_mkdir(localdir);
|
|
|
|
|
|
|
|
/* set up the origin to point to our remote */
|
|
|
|
git_repository_init_options init_opts = GIT_REPOSITORY_INIT_OPTIONS_INIT;
|
|
|
|
init_opts.origin_url = remote;
|
|
|
|
|
|
|
|
/* now initialize the repository with */
|
|
|
|
git_repository_init_ext(&repo, localdir, &init_opts);
|
|
|
|
|
|
|
|
/* create a config so we can set the remote tracking branch */
|
|
|
|
git_repository_config(&conf, repo);
|
|
|
|
len = sizeof("branch..remote") + strlen(branch);
|
|
|
|
variable_name = malloc(len);
|
|
|
|
snprintf(variable_name, len, "branch.%s.remote", branch);
|
|
|
|
git_config_set_string(conf, variable_name, "origin");
|
|
|
|
/* we know this is shorter than the previous one, so we reuse the variable*/
|
|
|
|
snprintf(variable_name, len, "branch.%s.merge", branch);
|
|
|
|
len = sizeof("refs/heads/") + strlen(branch);
|
|
|
|
merge_head = malloc(len);
|
|
|
|
snprintf(merge_head, len, "refs/heads/%s", branch);
|
|
|
|
git_config_set_string(conf, variable_name, merge_head);
|
|
|
|
|
|
|
|
/* finally create an empty commit and push it to the remote */
|
|
|
|
if (do_git_save(repo, branch, remote, false, true))
|
|
|
|
return NULL;
|
|
|
|
return(repo);
|
|
|
|
}
|
|
|
|
|
2015-06-13 15:01:06 +00:00
|
|
|
static git_repository *create_local_repo(const char *localdir, const char *remote, const char *branch, enum remote_transport rt)
|
2015-02-08 18:35:25 +00:00
|
|
|
{
|
|
|
|
int error;
|
|
|
|
git_repository *cloned_repo = NULL;
|
|
|
|
git_clone_options opts = GIT_CLONE_OPTIONS_INIT;
|
2015-05-28 23:09:29 +00:00
|
|
|
#if USE_LIBGIT23_API
|
2015-06-19 14:31:15 +00:00
|
|
|
if (rt == RT_SSH)
|
2015-06-01 00:15:58 +00:00
|
|
|
opts.fetch_opts.callbacks.credentials = credential_ssh_cb;
|
2015-06-19 14:31:15 +00:00
|
|
|
else if (rt == RT_HTTPS)
|
2015-06-01 00:15:58 +00:00
|
|
|
opts.fetch_opts.callbacks.credentials = credential_https_cb;
|
2015-06-13 16:13:08 +00:00
|
|
|
opts.repository_cb = repository_create_cb;
|
2015-07-13 18:20:18 +00:00
|
|
|
opts.fetch_opts.callbacks.certificate_check = certificate_check_cb;
|
2015-05-28 19:03:51 +00:00
|
|
|
#endif
|
2015-02-08 18:35:25 +00:00
|
|
|
opts.checkout_branch = branch;
|
2015-06-13 15:04:20 +00:00
|
|
|
if (rt == RT_HTTPS && !canReachCloudServer())
|
|
|
|
return 0;
|
2015-02-08 18:35:25 +00:00
|
|
|
error = git_clone(&cloned_repo, remote, localdir, &opts);
|
|
|
|
if (error) {
|
2015-06-13 16:12:16 +00:00
|
|
|
char *msg = giterr_last()->message;
|
2015-06-22 03:02:01 +00:00
|
|
|
int len = sizeof("Reference 'refs/remotes/origin/' not found") + strlen(branch);
|
2015-06-13 16:12:16 +00:00
|
|
|
char *pattern = malloc(len);
|
|
|
|
snprintf(pattern, len, "Reference 'refs/remotes/origin/%s' not found", branch);
|
2015-06-15 13:05:00 +00:00
|
|
|
if (strstr(remote, prefs.cloud_git_url) && strstr(msg, pattern)) {
|
2015-06-14 01:33:12 +00:00
|
|
|
/* we're trying to open the remote branch that corresponds
|
|
|
|
* to our cloud storage and the branch doesn't exist.
|
|
|
|
* So we need to create the branch and push it to the remote */
|
|
|
|
cloned_repo = create_and_push_remote(localdir, remote, branch);
|
2015-07-13 14:11:55 +00:00
|
|
|
#if !defined(DEBUG)
|
2015-06-15 13:05:00 +00:00
|
|
|
} else if (strstr(remote, prefs.cloud_git_url)) {
|
2015-06-13 16:12:16 +00:00
|
|
|
report_error(translate("gettextFromC", "Error connecting to Subsurface cloud storage"));
|
2015-07-13 14:11:55 +00:00
|
|
|
#endif
|
2015-06-13 16:12:16 +00:00
|
|
|
} else {
|
|
|
|
report_error(translate("gettextFromC", "git clone of %s failed (%s)"), remote, msg);
|
|
|
|
}
|
|
|
|
free(pattern);
|
2015-02-08 18:35:25 +00:00
|
|
|
}
|
|
|
|
return cloned_repo;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct git_repository *get_remote_repo(const char *localdir, const char *remote, const char *branch)
|
|
|
|
{
|
|
|
|
struct stat st;
|
2015-06-13 15:01:06 +00:00
|
|
|
enum remote_transport rt;
|
|
|
|
|
|
|
|
/* figure out the remote transport */
|
|
|
|
if (strncmp(remote, "ssh://", 6) == 0)
|
|
|
|
rt = RT_SSH;
|
|
|
|
else if (strncmp(remote, "https://", 8) == 0)
|
|
|
|
rt = RT_HTTPS;
|
|
|
|
else
|
|
|
|
rt = RT_OTHER;
|
2015-02-08 18:35:25 +00:00
|
|
|
|
|
|
|
/* Do we already have a local cache? */
|
|
|
|
if (!stat(localdir, &st)) {
|
|
|
|
if (!S_ISDIR(st.st_mode)) {
|
|
|
|
report_error("local git cache at '%s' is corrupt");
|
|
|
|
return NULL;
|
|
|
|
}
|
2015-06-13 15:01:06 +00:00
|
|
|
return update_local_repo(localdir, remote, branch, rt);
|
2015-02-08 18:35:25 +00:00
|
|
|
}
|
2015-06-13 15:01:06 +00:00
|
|
|
return create_local_repo(localdir, remote, branch, rt);
|
2015-02-08 18:35:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This turns a remote repository into a local one if possible.
|
|
|
|
*
|
|
|
|
* The recognized formats are
|
|
|
|
* git://host/repo[branch]
|
|
|
|
* ssh://host/repo[branch]
|
|
|
|
* http://host/repo[branch]
|
|
|
|
* https://host/repo[branch]
|
|
|
|
* file://repo[branch]
|
|
|
|
*/
|
2015-06-01 05:11:27 +00:00
|
|
|
static struct git_repository *is_remote_git_repository(char *remote, const char *branch)
|
2015-02-08 18:35:25 +00:00
|
|
|
{
|
|
|
|
char c, *localdir;
|
|
|
|
const char *p = remote;
|
|
|
|
|
|
|
|
while ((c = *p++) >= 'a' && c <= 'z')
|
|
|
|
/* nothing */;
|
|
|
|
if (c != ':')
|
|
|
|
return NULL;
|
|
|
|
if (*p++ != '/' || *p++ != '/')
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* Special-case "file://", since it's already local */
|
|
|
|
if (!strncmp(remote, "file://", 7))
|
|
|
|
remote += 7;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Ok, we found "[a-z]*://", we've simplified the
|
|
|
|
* local repo case (because libgit2 is insanely slow
|
|
|
|
* for that), and we think we have a real "remote
|
|
|
|
* git" format.
|
|
|
|
*
|
|
|
|
* We now create the SHA1 hash of the whole thing,
|
|
|
|
* including the branch name. That will be our unique
|
|
|
|
* unique local repository name.
|
|
|
|
*
|
|
|
|
* NOTE! We will create a local repository per branch,
|
|
|
|
* because
|
|
|
|
*
|
|
|
|
* (a) libgit2 remote tracking branch support seems to
|
|
|
|
* be a bit lacking
|
|
|
|
* (b) we'll actually check the branch out so that we
|
|
|
|
* can do merges etc too.
|
|
|
|
*
|
|
|
|
* so even if you have a single remote git repo with
|
|
|
|
* multiple branches for different people, the local
|
|
|
|
* caches will sadly force that to split into multiple
|
|
|
|
* individual repositories.
|
|
|
|
*/
|
2015-06-01 05:11:27 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* next we need to make sure that any encoded username
|
|
|
|
* has been extracted from an https:// based URL
|
|
|
|
*/
|
|
|
|
if (!strncmp(remote, "https://", 8)) {
|
|
|
|
char *at = strchr(remote, '@');
|
|
|
|
if (at) {
|
2015-06-10 03:54:01 +00:00
|
|
|
/* was this the @ that denotes an account? that means it was before the
|
|
|
|
* first '/' after the https:// - so let's find a '/' after that and compare */
|
|
|
|
char *slash = strchr(remote + 8, '/');
|
|
|
|
if (slash && slash > at) {
|
|
|
|
/* grab the part between "https://" and "@" as encoded email address
|
|
|
|
* (that's our username) and move the rest of the URL forward, remembering
|
|
|
|
* to copy the closing NUL as well */
|
|
|
|
prefs.cloud_storage_email_encoded = strndup(remote + 8, at - remote - 8);
|
|
|
|
memmove(remote + 8, at + 1, strlen(at + 1) + 1);
|
|
|
|
}
|
2015-06-01 05:11:27 +00:00
|
|
|
}
|
|
|
|
}
|
2015-02-08 18:35:25 +00:00
|
|
|
localdir = get_local_dir(remote, branch);
|
|
|
|
if (!localdir)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return get_remote_repo(localdir, remote, branch);
|
|
|
|
}
|
2015-01-23 03:40:01 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If it's not a git repo, return NULL. Be very conservative.
|
|
|
|
*/
|
2015-06-12 19:32:12 +00:00
|
|
|
struct git_repository *is_git_repository(const char *filename, const char **branchp, const char **remote)
|
2015-01-23 03:40:01 +00:00
|
|
|
{
|
|
|
|
int flen, blen, ret;
|
2015-05-28 15:14:16 +00:00
|
|
|
int offset = 1;
|
2015-01-23 03:40:01 +00:00
|
|
|
struct stat st;
|
|
|
|
git_repository *repo;
|
|
|
|
char *loc, *branch;
|
|
|
|
|
|
|
|
flen = strlen(filename);
|
|
|
|
if (!flen || filename[--flen] != ']')
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* Find the matching '[' */
|
|
|
|
blen = 0;
|
|
|
|
while (flen && filename[--flen] != '[')
|
|
|
|
blen++;
|
|
|
|
|
2015-02-08 18:35:25 +00:00
|
|
|
/* Ignore slashes at the end of the repo name */
|
2015-05-28 15:14:16 +00:00
|
|
|
while (flen && filename[flen-1] == '/') {
|
2015-02-08 18:35:25 +00:00
|
|
|
flen--;
|
2015-05-28 15:14:16 +00:00
|
|
|
offset++;
|
|
|
|
}
|
2015-02-08 18:35:25 +00:00
|
|
|
|
2015-01-23 03:40:01 +00:00
|
|
|
if (!flen)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This is the "point of no return": the name matches
|
|
|
|
* the git repository name rules, and we will no longer
|
|
|
|
* return NULL.
|
|
|
|
*
|
|
|
|
* We will either return "dummy_git_repository" and the
|
|
|
|
* branch pointer will have the _whole_ filename in it,
|
|
|
|
* or we will return a real git repository with the
|
|
|
|
* branch pointer being filled in with just the branch
|
|
|
|
* name.
|
|
|
|
*
|
|
|
|
* The actual git reading/writing routines can use this
|
|
|
|
* to generate proper error messages.
|
|
|
|
*/
|
|
|
|
*branchp = filename;
|
2015-01-24 00:56:34 +00:00
|
|
|
loc = format_string("%.*s", flen, filename);
|
2015-01-23 03:40:01 +00:00
|
|
|
if (!loc)
|
|
|
|
return dummy_git_repository;
|
|
|
|
|
2015-05-28 15:14:16 +00:00
|
|
|
branch = format_string("%.*s", blen, filename + flen + offset);
|
2015-01-23 03:40:01 +00:00
|
|
|
if (!branch) {
|
|
|
|
free(loc);
|
|
|
|
return dummy_git_repository;
|
|
|
|
}
|
|
|
|
|
2015-02-08 18:35:25 +00:00
|
|
|
repo = is_remote_git_repository(loc, branch);
|
|
|
|
if (repo) {
|
2015-06-12 19:32:12 +00:00
|
|
|
if (remote)
|
|
|
|
*remote = loc;
|
|
|
|
else
|
|
|
|
free(loc);
|
2015-02-08 18:35:25 +00:00
|
|
|
*branchp = branch;
|
|
|
|
return repo;
|
|
|
|
}
|
|
|
|
|
2015-01-23 03:40:01 +00:00
|
|
|
if (stat(loc, &st) < 0 || !S_ISDIR(st.st_mode)) {
|
|
|
|
free(loc);
|
|
|
|
free(branch);
|
|
|
|
return dummy_git_repository;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = git_repository_open(&repo, loc);
|
|
|
|
free(loc);
|
|
|
|
if (ret < 0) {
|
|
|
|
free(branch);
|
|
|
|
return dummy_git_repository;
|
|
|
|
}
|
2015-06-17 03:37:15 +00:00
|
|
|
if (remote)
|
|
|
|
*remote = NULL;
|
2015-01-23 03:40:01 +00:00
|
|
|
*branchp = branch;
|
|
|
|
return repo;
|
|
|
|
}
|