mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
core: replace SSRF_INFO macro by report_info()
The point of this macro is unclear. It just calls report_info() anyway... Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger
Dirk Hohndel
parent
bfbf4934dd
commit
8980d61786
8 changed files with 79 additions and 80 deletions
|
|
@ -18,7 +18,6 @@ extern int verbose;
|
|||
extern int __printf(1, 2) report_error(const char *fmt, ...);
|
||||
extern void __printf(1, 2) report_info(const char *fmt, ...);
|
||||
extern void set_error_cb(void(*cb)(char *)); // Callback takes ownership of passed string
|
||||
#define SSRF_INFO(fmt, ...) report_info(fmt, ##__VA_ARGS__)
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ static int check_clean(const char *path, unsigned int status, void *payload)
|
|||
status &= ~GIT_STATUS_CURRENT | GIT_STATUS_IGNORED;
|
||||
if (!status)
|
||||
return 0;
|
||||
SSRF_INFO("git storage: local cache dir %s modified, git status 0x%04x", path, status);
|
||||
report_info("git storage: local cache dir %s modified, git status 0x%04x", path, status);
|
||||
if (info->is_subsurface_cloud)
|
||||
report_error(translate("gettextFromC", "Local cache directory %s corrupted - can't sync with Subsurface cloud storage"), path);
|
||||
else
|
||||
|
|
@ -183,14 +183,14 @@ static int reset_to_remote(struct git_info *info, git_reference *local, const gi
|
|||
git_object *target;
|
||||
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage: reset to remote\n");
|
||||
report_info("git storage: reset to remote\n");
|
||||
|
||||
/* If it's not checked out (bare or not HEAD), just update the reference */
|
||||
if (git_repository_is_bare(info->repo) || git_branch_is_head(local) != 1) {
|
||||
git_reference *out;
|
||||
|
||||
if (git_reference_set_target(&out, local, new_id, "Update to remote")) {
|
||||
SSRF_INFO("git storage: could not update local cache to newer remote data");
|
||||
report_info("git storage: could not update local cache to newer remote data");
|
||||
return report_error("%s", translate("gettextFromC", "Could not update local cache to newer remote data"));
|
||||
}
|
||||
git_reference_free(out);
|
||||
|
|
@ -203,7 +203,7 @@ static int reset_to_remote(struct git_info *info, git_reference *local, const gi
|
|||
}
|
||||
|
||||
if (git_object_lookup(&target, info->repo, new_id, GIT_OBJ_COMMIT)) {
|
||||
SSRF_INFO("git storage: could not look up remote commit");
|
||||
report_info("git storage: could not look up remote commit");
|
||||
if (info->is_subsurface_cloud)
|
||||
return report_error("%s", translate("gettextFromC", "Subsurface cloud storage corrupted"));
|
||||
else
|
||||
|
|
@ -211,7 +211,7 @@ static int reset_to_remote(struct git_info *info, git_reference *local, const gi
|
|||
}
|
||||
opts.checkout_strategy = GIT_CHECKOUT_SAFE;
|
||||
if (git_reset(info->repo, target, GIT_RESET_HARD, &opts)) {
|
||||
SSRF_INFO("git storage: local head checkout failed after update");
|
||||
report_info("git storage: local head checkout failed after update");
|
||||
if (info->is_subsurface_cloud)
|
||||
return report_error("%s", translate("gettextFromC", "Could not update local cache to newer remote data"));
|
||||
else
|
||||
|
|
@ -230,7 +230,7 @@ static const int max_auth_attempts = 2;
|
|||
static bool exceeded_auth_attempts()
|
||||
{
|
||||
if (auth_attempt++ > max_auth_attempts) {
|
||||
SSRF_INFO("git storage: authentication to cloud storage failed");
|
||||
report_info("git storage: authentication to cloud storage failed");
|
||||
report_error("Authentication to cloud storage failed.");
|
||||
return true;
|
||||
}
|
||||
|
|
@ -290,7 +290,7 @@ extern "C" int credential_https_cb(git_cred **out,
|
|||
extern "C" int certificate_check_cb(git_cert *cert, int valid, const char *host, void *)
|
||||
{
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage: certificate callback for host %s with validity %d\n", host, valid);
|
||||
report_info("git storage: certificate callback for host %s with validity %d\n", host, valid);
|
||||
if ((same_string(host, CLOUD_HOST_GENERIC) ||
|
||||
same_string(host, CLOUD_HOST_US) ||
|
||||
same_string(host, CLOUD_HOST_U2) ||
|
||||
|
|
@ -314,7 +314,7 @@ static int update_remote(struct git_info *info, git_remote *origin, git_referenc
|
|||
const char *name = git_reference_name(local);
|
||||
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage: update remote\n");
|
||||
report_info("git storage: update remote\n");
|
||||
|
||||
refspec.count = 1;
|
||||
refspec.strings = (char **)&name;
|
||||
|
|
@ -329,7 +329,7 @@ static int update_remote(struct git_info *info, git_remote *origin, git_referenc
|
|||
|
||||
if (git_remote_push(origin, &refspec, &opts)) {
|
||||
const char *msg = giterr_last()->message;
|
||||
SSRF_INFO("git storage: unable to update remote with current local cache state, error: %s", msg);
|
||||
report_info("git storage: unable to update remote with current local cache state, error: %s", msg);
|
||||
if (info->is_subsurface_cloud)
|
||||
return report_error("%s", translate("gettextFromC", "Could not update Subsurface cloud storage, try again later"));
|
||||
else
|
||||
|
|
@ -353,7 +353,7 @@ static int try_to_git_merge(struct git_info *info, git_reference **local_p, git_
|
|||
outlocal[40] = outremote[40] = 0;
|
||||
git_oid_fmt(outlocal, local_id);
|
||||
git_oid_fmt(outremote, remote_id);
|
||||
SSRF_INFO("git storage: trying to merge local SHA %s remote SHA %s\n", outlocal, outremote);
|
||||
report_info("git storage: trying to merge local SHA %s remote SHA %s\n", outlocal, outremote);
|
||||
}
|
||||
|
||||
git_merge_init_options(&merge_options, GIT_MERGE_OPTIONS_VERSION);
|
||||
|
|
@ -361,31 +361,31 @@ static int try_to_git_merge(struct git_info *info, git_reference **local_p, git_
|
|||
merge_options.file_favor = GIT_MERGE_FILE_FAVOR_UNION;
|
||||
merge_options.rename_threshold = 100;
|
||||
if (git_commit_lookup(&local_commit, info->repo, local_id)) {
|
||||
SSRF_INFO("git storage: remote storage and local data diverged. Error: can't get commit (%s)", giterr_last()->message);
|
||||
report_info("git storage: remote storage and local data diverged. Error: can't get commit (%s)", giterr_last()->message);
|
||||
goto diverged_error;
|
||||
}
|
||||
if (git_commit_tree(&local_tree, local_commit)) {
|
||||
SSRF_INFO("git storage: remote storage and local data diverged. Error: failed local tree lookup (%s)", giterr_last()->message);
|
||||
report_info("git storage: remote storage and local data diverged. Error: failed local tree lookup (%s)", giterr_last()->message);
|
||||
goto diverged_error;
|
||||
}
|
||||
if (git_commit_lookup(&remote_commit, info->repo, remote_id)) {
|
||||
SSRF_INFO("git storage: remote storage and local data diverged. Error: can't get commit (%s)", giterr_last()->message);
|
||||
report_info("git storage: remote storage and local data diverged. Error: can't get commit (%s)", giterr_last()->message);
|
||||
goto diverged_error;
|
||||
}
|
||||
if (git_commit_tree(&remote_tree, remote_commit)) {
|
||||
SSRF_INFO("git storage: remote storage and local data diverged. Error: failed local tree lookup (%s)", giterr_last()->message);
|
||||
report_info("git storage: remote storage and local data diverged. Error: failed local tree lookup (%s)", giterr_last()->message);
|
||||
goto diverged_error;
|
||||
}
|
||||
if (git_commit_lookup(&base_commit, info->repo, base)) {
|
||||
SSRF_INFO("git storage: remote storage and local data diverged. Error: can't get commit (%s)", giterr_last()->message);
|
||||
report_info("git storage: remote storage and local data diverged. Error: can't get commit (%s)", giterr_last()->message);
|
||||
goto diverged_error;
|
||||
}
|
||||
if (git_commit_tree(&base_tree, base_commit)) {
|
||||
SSRF_INFO("git storage: remote storage and local data diverged. Error: failed base tree lookup (%s)", giterr_last()->message);
|
||||
report_info("git storage: remote storage and local data diverged. Error: failed base tree lookup (%s)", giterr_last()->message);
|
||||
goto diverged_error;
|
||||
}
|
||||
if (git_merge_trees(&merged_index, info->repo, base_tree, local_tree, remote_tree, &merge_options)) {
|
||||
SSRF_INFO("git storage: remote storage and local data diverged. Error: merge failed (%s)", giterr_last()->message);
|
||||
report_info("git storage: remote storage and local data diverged. Error: merge failed (%s)", giterr_last()->message);
|
||||
// this is the one where I want to report more detail to the user - can't quite explain why
|
||||
return report_error(translate("gettextFromC", "Remote storage and local data diverged. Error: merge failed (%s)"), giterr_last()->message);
|
||||
}
|
||||
|
|
@ -399,20 +399,20 @@ static int try_to_git_merge(struct git_info *info, git_reference **local_p, git_
|
|||
while (git_index_conflict_next(&ancestor, &ours, &theirs, iter)
|
||||
!= GIT_ITEROVER) {
|
||||
/* Mark this conflict as resolved */
|
||||
SSRF_INFO("git storage: conflict in %s / %s / %s -- ",
|
||||
report_info("git storage: conflict in %s / %s / %s -- ",
|
||||
ours ? ours->path : "-",
|
||||
theirs ? theirs->path : "-",
|
||||
ancestor ? ancestor->path : "-");
|
||||
if ((!ours && theirs && ancestor) ||
|
||||
(ours && !theirs && ancestor)) {
|
||||
// the file was removed on one side or the other - just remove it
|
||||
SSRF_INFO("git storage: looks like a delete on one side; removing the file from the index\n");
|
||||
report_info("git storage: looks like a delete on one side; removing the file from the index\n");
|
||||
error = git_index_remove(merged_index, ours ? ours->path : theirs->path, GIT_INDEX_STAGE_ANY);
|
||||
} else if (ancestor) {
|
||||
error = git_index_conflict_remove(merged_index, ours ? ours->path : theirs ? theirs->path : ancestor->path);
|
||||
}
|
||||
if (error) {
|
||||
SSRF_INFO("git storage: error at conflict resolution (%s)", giterr_last()->message);
|
||||
report_info("git storage: error at conflict resolution (%s)", giterr_last()->message);
|
||||
}
|
||||
}
|
||||
git_index_conflict_cleanup(merged_index);
|
||||
|
|
@ -449,7 +449,7 @@ static int try_to_git_merge(struct git_info *info, git_reference **local_p, git_
|
|||
set_git_id(&commit_oid);
|
||||
git_signature_free(author);
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage: successfully merged repositories");
|
||||
report_info("git storage: successfully merged repositories");
|
||||
free_buffer(&msg);
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -468,7 +468,7 @@ write_error:
|
|||
static int cleanup_local_cache(struct git_info *info)
|
||||
{
|
||||
char *backup_path = move_local_cache(info);
|
||||
SSRF_INFO("git storage: problems with local cache, moved to %s", backup_path);
|
||||
report_info("git storage: problems with local cache, moved to %s", backup_path);
|
||||
report_error("%s", translate("gettextFromC", "Problems with local cache of Subsurface cloud data"));
|
||||
report_error(translate("gettextFromC", "Moved cache data to %s. Please try the operation again."), backup_path);
|
||||
free(backup_path);
|
||||
|
|
@ -482,7 +482,7 @@ static int try_to_update(struct git_info *info, git_remote *origin, git_referenc
|
|||
int ret = 0;
|
||||
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage: try to update\n");
|
||||
report_info("git storage: try to update\n");
|
||||
|
||||
if (!git_reference_cmp(local, remote))
|
||||
return 0;
|
||||
|
|
@ -490,7 +490,7 @@ static int try_to_update(struct git_info *info, git_remote *origin, git_referenc
|
|||
// Dirty modified state in the working tree? We're not going
|
||||
// to update either way
|
||||
if (git_status_foreach(info->repo, check_clean, (void *)info)) {
|
||||
SSRF_INFO("git storage: local cache is dirty, skipping update");
|
||||
report_info("git storage: local cache is dirty, skipping update");
|
||||
if (info->is_subsurface_cloud)
|
||||
goto cloud_data_error;
|
||||
else
|
||||
|
|
@ -501,9 +501,9 @@ static int try_to_update(struct git_info *info, git_remote *origin, git_referenc
|
|||
|
||||
if (!local_id || !remote_id) {
|
||||
if (!local_id)
|
||||
SSRF_INFO("git storage: unable to get local SHA");
|
||||
report_info("git storage: unable to get local SHA");
|
||||
if (!remote_id)
|
||||
SSRF_INFO("git storage: unable to get remote SHA");
|
||||
report_info("git storage: unable to get remote SHA");
|
||||
if (info->is_subsurface_cloud)
|
||||
goto cloud_data_error;
|
||||
else
|
||||
|
|
@ -515,7 +515,7 @@ static int try_to_update(struct git_info *info, git_remote *origin, git_referenc
|
|||
// so instead merge this as merging a commit into a repo - git_merge() appears to do that
|
||||
// but needs testing and cleanup afterwards
|
||||
//
|
||||
SSRF_INFO("git storage: no common commit between local and remote branches");
|
||||
report_info("git storage: no common commit between local and remote branches");
|
||||
if (info->is_subsurface_cloud)
|
||||
goto cloud_data_error;
|
||||
else
|
||||
|
|
@ -524,7 +524,7 @@ static int try_to_update(struct git_info *info, git_remote *origin, git_referenc
|
|||
/* Is the remote strictly newer? Use it */
|
||||
if (git_oid_equal(&base, local_id)) {
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage: remote is newer than local, update local");
|
||||
report_info("git storage: remote is newer than local, update local");
|
||||
git_storage_update_progress(translate("gettextFromC", "Update local storage to match cloud storage"));
|
||||
return reset_to_remote(info, local, remote_id);
|
||||
}
|
||||
|
|
@ -532,13 +532,13 @@ static int try_to_update(struct git_info *info, git_remote *origin, git_referenc
|
|||
/* Is the local repo the more recent one? See if we can update upstream */
|
||||
if (git_oid_equal(&base, remote_id)) {
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage: local is newer than remote, update remote");
|
||||
report_info("git storage: local is newer than remote, update remote");
|
||||
git_storage_update_progress(translate("gettextFromC", "Push local changes to cloud storage"));
|
||||
return update_remote(info, origin, local, remote);
|
||||
}
|
||||
/* Merging a bare repository always needs user action */
|
||||
if (git_repository_is_bare(info->repo)) {
|
||||
SSRF_INFO("git storage: local is bare and has diverged from remote; user action needed");
|
||||
report_info("git storage: local is bare and has diverged from remote; user action needed");
|
||||
if (info->is_subsurface_cloud)
|
||||
goto cloud_data_error;
|
||||
else
|
||||
|
|
@ -546,7 +546,7 @@ static int try_to_update(struct git_info *info, git_remote *origin, git_referenc
|
|||
}
|
||||
/* Merging will definitely need the head branch too */
|
||||
if (git_branch_is_head(local) != 1) {
|
||||
SSRF_INFO("git storage: local branch is not HEAD, cannot merge");
|
||||
report_info("git storage: local branch is not HEAD, cannot merge");
|
||||
if (info->is_subsurface_cloud)
|
||||
goto cloud_data_error;
|
||||
else
|
||||
|
|
@ -574,10 +574,10 @@ static int check_remote_status(struct git_info *info, git_remote *origin)
|
|||
git_reference *local_ref, *remote_ref;
|
||||
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage: check remote status\n");
|
||||
report_info("git storage: check remote status\n");
|
||||
|
||||
if (git_branch_lookup(&local_ref, info->repo, info->branch, GIT_BRANCH_LOCAL)) {
|
||||
SSRF_INFO("git storage: branch %s is missing in local repo", info->branch);
|
||||
report_info("git storage: branch %s is missing in local repo", info->branch);
|
||||
if (info->is_subsurface_cloud)
|
||||
return cleanup_local_cache(info);
|
||||
else
|
||||
|
|
@ -586,7 +586,7 @@ static int check_remote_status(struct git_info *info, git_remote *origin)
|
|||
if (git_branch_upstream(&remote_ref, local_ref)) {
|
||||
/* so there is no upstream branch for our branch; that's a problem.
|
||||
* let's push our branch */
|
||||
SSRF_INFO("git storage: branch %s is missing in remote, pushing branch", info->branch);
|
||||
report_info("git storage: branch %s is missing in remote, pushing branch", info->branch);
|
||||
git_strarray refspec;
|
||||
git_reference_list(&refspec, info->repo);
|
||||
git_push_options opts = GIT_PUSH_OPTIONS_INIT;
|
||||
|
|
@ -629,7 +629,7 @@ extern "C" void delete_remote_branch(git_repository *repo, const char *remote, c
|
|||
git_config_delete_entry(conf, "http.proxy");
|
||||
}
|
||||
if (git_remote_lookup(&origin, repo, "origin")) {
|
||||
SSRF_INFO("git storage: repository '%s' origin lookup failed (%s)", remote, giterr_last() ? giterr_last()->message : "(unspecified)");
|
||||
report_info("git storage: repository '%s' origin lookup failed (%s)", remote, giterr_last() ? giterr_last()->message : "(unspecified)");
|
||||
return;
|
||||
}
|
||||
/* fetch the remote state */
|
||||
|
|
@ -638,7 +638,7 @@ extern "C" void delete_remote_branch(git_repository *repo, const char *remote, c
|
|||
f_opts.callbacks.credentials = credential_https_cb;
|
||||
error = git_remote_fetch(origin, NULL, &f_opts, NULL);
|
||||
if (error) {
|
||||
SSRF_INFO("git storage: remote fetch failed (%s)\n", giterr_last() ? giterr_last()->message : "authentication failed");
|
||||
report_info("git storage: remote fetch failed (%s)\n", giterr_last() ? giterr_last()->message : "authentication failed");
|
||||
return;
|
||||
}
|
||||
/* delete the remote branch by pushing to ":refs/heads/<branch>" */
|
||||
|
|
@ -652,8 +652,8 @@ extern "C" void delete_remote_branch(git_repository *repo, const char *remote, c
|
|||
error = git_remote_push(origin, &refspec, &p_opts);
|
||||
free(branch_ref);
|
||||
if (error) {
|
||||
SSRF_INFO("git storage: unable to delete branch '%s'", branch);
|
||||
SSRF_INFO("git storage: error was (%s)\n", giterr_last() ? giterr_last()->message : "(unspecified)");
|
||||
report_info("git storage: unable to delete branch '%s'", branch);
|
||||
report_info("git storage: error was (%s)\n", giterr_last() ? giterr_last()->message : "(unspecified)");
|
||||
}
|
||||
git_remote_free(origin);
|
||||
return;
|
||||
|
|
@ -668,21 +668,21 @@ extern "C" int sync_with_remote(struct git_info *info)
|
|||
|
||||
if (git_local_only) {
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage: don't sync with remote - read from cache only\n");
|
||||
report_info("git storage: don't sync with remote - read from cache only\n");
|
||||
return 0;
|
||||
}
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage: sync with remote %s[%s]\n", info->url, info->branch);
|
||||
report_info("git storage: sync with remote %s[%s]\n", info->url, info->branch);
|
||||
git_storage_update_progress(translate("gettextFromC", "Sync with cloud storage"));
|
||||
git_repository_config(&conf, info->repo);
|
||||
if (info->transport == RT_HTTPS && getProxyString(&proxy_string)) {
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage: set proxy to \"%s\"\n", proxy_string);
|
||||
report_info("git storage: set proxy to \"%s\"\n", proxy_string);
|
||||
git_config_set_string(conf, "http.proxy", proxy_string);
|
||||
free(proxy_string);
|
||||
} else {
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage: delete proxy setting\n");
|
||||
report_info("git storage: delete proxy setting\n");
|
||||
git_config_delete_entry(conf, "http.proxy");
|
||||
}
|
||||
|
||||
|
|
@ -693,7 +693,7 @@ extern "C" int sync_with_remote(struct git_info *info)
|
|||
error = git_remote_lookup(&origin, info->repo, "origin");
|
||||
if (error) {
|
||||
const char *msg = giterr_last()->message;
|
||||
SSRF_INFO("git storage: repo %s origin lookup failed with: %s", info->url, msg);
|
||||
report_info("git storage: repo %s origin lookup failed with: %s", info->url, msg);
|
||||
if (!info->is_subsurface_cloud)
|
||||
report_error("Repository '%s' origin lookup failed (%s)", info->url, msg);
|
||||
return 0;
|
||||
|
|
@ -703,14 +703,14 @@ extern "C" int sync_with_remote(struct git_info *info)
|
|||
// here in case none of them are reachable, let's check one more time
|
||||
if (info->is_subsurface_cloud && !canReachCloudServer(info)) {
|
||||
// this is not an error, just a warning message, so return 0
|
||||
SSRF_INFO("git storage: cannot connect to remote server");
|
||||
report_info("git storage: cannot connect to remote server");
|
||||
report_error("Cannot connect to cloud server, working with local copy");
|
||||
git_storage_update_progress(translate("gettextFromC", "Can't reach cloud server, working with local data"));
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage: fetch remote %s\n", git_remote_url(origin));
|
||||
report_info("git storage: fetch remote %s\n", git_remote_url(origin));
|
||||
git_fetch_options opts = GIT_FETCH_OPTIONS_INIT;
|
||||
opts.callbacks.transfer_progress = &transfer_progress_cb;
|
||||
auth_attempt = 0;
|
||||
|
|
@ -728,7 +728,7 @@ extern "C" int sync_with_remote(struct git_info *info)
|
|||
else
|
||||
report_error("Unable to fetch remote '%s'", info->url);
|
||||
// If we returned GIT_EUSER during authentication, giterr_last() returns NULL
|
||||
SSRF_INFO("git storage: remote fetch failed (%s)\n", giterr_last() ? giterr_last()->message : "authentication failed");
|
||||
report_info("git storage: remote fetch failed (%s)\n", giterr_last() ? giterr_last()->message : "authentication failed");
|
||||
// Since we failed to sync with online repository, enter offline mode
|
||||
git_local_only = true;
|
||||
error = 0;
|
||||
|
|
@ -750,7 +750,7 @@ static bool update_local_repo(struct git_info *info)
|
|||
if (!git_branch_name(&name, head)) {
|
||||
if (strcmp(name, info->branch)) {
|
||||
char *branchref = format_string("refs/heads/%s", info->branch);
|
||||
SSRF_INFO("git storage: setting cache branch from '%s' to '%s'", name, info->branch);
|
||||
report_info("git storage: setting cache branch from '%s' to '%s'", name, info->branch);
|
||||
git_repository_set_head(info->repo, branchref);
|
||||
free(branchref);
|
||||
}
|
||||
|
|
@ -759,7 +759,7 @@ static bool update_local_repo(struct git_info *info)
|
|||
}
|
||||
/* make sure we have the correct origin - the cloud server URL could have changed */
|
||||
if (git_remote_set_url(info->repo, "origin", info->url)) {
|
||||
SSRF_INFO("git storage: failed to update origin to '%s'", info->url);
|
||||
report_info("git storage: failed to update origin to '%s'", info->url);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -777,19 +777,19 @@ static int repository_create_cb(git_repository **out, const char *path, int bare
|
|||
int ret = git_repository_init(out, path, bare);
|
||||
if (ret != 0) {
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage: initializing git repository failed\n");
|
||||
report_info("git storage: initializing git repository failed\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
git_repository_config(&conf, *out);
|
||||
if (getProxyString(&proxy_string)) {
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage: set proxy to \"%s\"\n", proxy_string);
|
||||
report_info("git storage: set proxy to \"%s\"\n", proxy_string);
|
||||
git_config_set_string(conf, "http.proxy", proxy_string);
|
||||
free(proxy_string);
|
||||
} else {
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage: delete proxy setting\n");
|
||||
report_info("git storage: delete proxy setting\n");
|
||||
git_config_delete_entry(conf, "http.proxy");
|
||||
}
|
||||
return ret;
|
||||
|
|
@ -803,7 +803,7 @@ static bool create_and_push_remote(struct git_info *info)
|
|||
char *variable_name, *head;
|
||||
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage: create and push remote\n");
|
||||
report_info("git storage: create and push remote\n");
|
||||
|
||||
/* first make sure the directory for the local cache exists */
|
||||
subsurface_mkdir(info->localdir);
|
||||
|
|
@ -842,7 +842,7 @@ static bool create_local_repo(struct git_info *info)
|
|||
git_clone_options opts = GIT_CLONE_OPTIONS_INIT;
|
||||
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage: create_local_repo\n");
|
||||
report_info("git storage: create_local_repo\n");
|
||||
|
||||
auth_attempt = 0;
|
||||
opts.fetch_opts.callbacks.transfer_progress = &transfer_progress_cb;
|
||||
|
|
@ -855,22 +855,22 @@ static bool create_local_repo(struct git_info *info)
|
|||
|
||||
opts.checkout_branch = info->branch;
|
||||
if (info->is_subsurface_cloud && !canReachCloudServer(info)) {
|
||||
SSRF_INFO("git storage: cannot reach remote server");
|
||||
report_info("git storage: cannot reach remote server");
|
||||
return false;
|
||||
}
|
||||
if (verbose > 1)
|
||||
SSRF_INFO("git storage: calling git_clone()\n");
|
||||
report_info("git storage: calling git_clone()\n");
|
||||
error = git_clone(&info->repo, info->url, info->localdir, &opts);
|
||||
if (verbose > 1)
|
||||
SSRF_INFO("git storage: returned from git_clone() with return value %d\n", error);
|
||||
report_info("git storage: returned from git_clone() with return value %d\n", error);
|
||||
if (error) {
|
||||
SSRF_INFO("git storage: clone of %s failed", info->url);
|
||||
report_info("git storage: clone of %s failed", info->url);
|
||||
const char *msg = "";
|
||||
if (giterr_last()) {
|
||||
msg = giterr_last()->message;
|
||||
SSRF_INFO("git storage: error message was %s\n", msg);
|
||||
report_info("git storage: error message was %s\n", msg);
|
||||
} else {
|
||||
SSRF_INFO("git storage: giterr_last() is null\n");
|
||||
report_info("git storage: giterr_last() is null\n");
|
||||
}
|
||||
char *pattern = format_string("reference 'refs/remotes/origin/%s' not found", info->branch);
|
||||
// it seems that we sometimes get 'Reference' and sometimes 'reference'
|
||||
|
|
@ -879,7 +879,7 @@ static bool create_local_repo(struct git_info *info)
|
|||
* to our cloud storage and the branch doesn't exist.
|
||||
* So we need to create the branch and push it to the remote */
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage: remote repo didn't include our branch\n");
|
||||
report_info("git storage: remote repo didn't include our branch\n");
|
||||
if (create_and_push_remote(info))
|
||||
error = 0;
|
||||
#if !defined(DEBUG) && !defined(SUBSURFACE_MOBILE)
|
||||
|
|
@ -910,7 +910,7 @@ static bool get_remote_repo(struct git_info *info)
|
|||
struct stat st;
|
||||
|
||||
if (verbose > 1) {
|
||||
SSRF_INFO("git storage: accessing %s\n", info->url);
|
||||
report_info("git storage: accessing %s\n", info->url);
|
||||
}
|
||||
git_storage_update_progress(translate("gettextFromC", "Synchronising data file"));
|
||||
/* Do we already have a local cache? */
|
||||
|
|
@ -918,12 +918,12 @@ static bool get_remote_repo(struct git_info *info)
|
|||
int error;
|
||||
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage: update local repo\n");
|
||||
report_info("git storage: update local repo\n");
|
||||
|
||||
error = git_repository_open(&info->repo, info->localdir);
|
||||
if (error) {
|
||||
const char *msg = giterr_last()->message;
|
||||
SSRF_INFO("git storage: unable to open local cache at %s: %s", info->localdir, msg);
|
||||
report_info("git storage: unable to open local cache at %s: %s", info->localdir, msg);
|
||||
if (info->is_subsurface_cloud)
|
||||
(void)cleanup_local_cache(info);
|
||||
else
|
||||
|
|
@ -1128,7 +1128,7 @@ extern "C" bool open_git_repository(struct git_info *info)
|
|||
|
||||
if (git_repository_open(&info->repo, url)) {
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage: loc %s couldn't be opened (%s)\n", url, giterr_last()->message);
|
||||
report_info("git storage: loc %s couldn't be opened (%s)\n", url, giterr_last()->message);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -1042,7 +1042,7 @@ static void parse_settings_fingerprint(char *line, struct git_parser_state *stat
|
|||
line = parse_keyvalue_entry(parse_fingerprint_keyvalue, &fph, line, state);
|
||||
}
|
||||
if (verbose > 1)
|
||||
SSRF_INFO("fingerprint %08x %08x %08x %08x %s\n", fph.model, fph.serial, fph.fdeviceid, fph.fdiveid, fph.hex_data.c_str());
|
||||
report_info("fingerprint %08x %08x %08x %08x %s\n", fph.model, fph.serial, fph.fdeviceid, fph.fdiveid, fph.hex_data.c_str());
|
||||
create_fingerprint_node_from_hex(&fingerprint_table, fph.model, fph.serial,
|
||||
fph.hex_data.c_str(), fph.fdeviceid, fph.fdiveid);
|
||||
}
|
||||
|
|
@ -1336,7 +1336,7 @@ static unsigned parse_one_line(const char *buf, unsigned size, line_fn_t *fn, st
|
|||
if (*p++ == '\n')
|
||||
break;
|
||||
} while (p < end);
|
||||
SSRF_INFO("git storage: Ignoring line '%.*s'", (int)(p-buf-1), buf);
|
||||
report_info("git storage: Ignoring line '%.*s'", (int)(p-buf-1), buf);
|
||||
return p - buf;
|
||||
default:
|
||||
break;
|
||||
|
|
@ -1799,7 +1799,7 @@ static int walk_tree_file(const char *root, const git_tree_entry *entry, struct
|
|||
dive_trip_t *trip = state->active_trip;
|
||||
const char *name = git_tree_entry_name(entry);
|
||||
if (verbose > 1)
|
||||
SSRF_INFO("git load handling file %s\n", name);
|
||||
report_info("git load handling file %s\n", name);
|
||||
switch (*name) {
|
||||
case '-': case '+':
|
||||
if (dive)
|
||||
|
|
|
|||
|
|
@ -199,7 +199,7 @@ int get_cylinder_index(const struct dive *dive, const struct event *ev)
|
|||
* We now match up gas change events with their cylinders at dive
|
||||
* event fixup time.
|
||||
*/
|
||||
SSRF_INFO("Still looking up cylinder based on gas mix in get_cylinder_index()!\n");
|
||||
report_info("Still looking up cylinder based on gas mix in get_cylinder_index()!\n");
|
||||
|
||||
mix = get_gasmix_from_event(dive, ev);
|
||||
best = find_best_gasmix_match(mix, &dive->cylinders);
|
||||
|
|
@ -972,7 +972,7 @@ static void calculate_deco_information(struct deco_state *ds, const struct deco_
|
|||
entry->ambpressure = depth_to_bar(entry->depth, dive);
|
||||
entry->gfline = get_gf(ds, entry->ambpressure, dive) * (100.0 - AMB_PERCENTAGE) + AMB_PERCENTAGE;
|
||||
if (t0 > t1) {
|
||||
SSRF_INFO("non-monotonous dive stamps %d %d\n", t0, t1);
|
||||
report_info("non-monotonous dive stamps %d %d\n", t0, t1);
|
||||
int xchg = t1;
|
||||
t1 = t0;
|
||||
t0 = xchg;
|
||||
|
|
|
|||
|
|
@ -473,7 +473,7 @@ static void create_dive_buffer(struct dive *dive, struct membuffer *b)
|
|||
if (dive->dive_site)
|
||||
put_format(b, "divesiteid %08x\n", dive->dive_site->uuid);
|
||||
if (verbose && dive->dive_site)
|
||||
SSRF_INFO("removed reference to non-existant dive site with uuid %08x\n", dive->dive_site->uuid);
|
||||
report_info("removed reference to non-existant dive site with uuid %08x\n", dive->dive_site->uuid);
|
||||
save_overview(b, dive);
|
||||
save_cylinder_info(b, dive);
|
||||
save_weightsystem_info(b, dive);
|
||||
|
|
@ -526,7 +526,7 @@ static int tree_insert(git_treebuilder *dir, const char *name, int mkunique, git
|
|||
if (ret) {
|
||||
const git_error *gerr = giterr_last();
|
||||
if (gerr) {
|
||||
SSRF_INFO("tree_insert failed with return %d error %s\n", ret, gerr->message);
|
||||
report_info("tree_insert failed with return %d error %s\n", ret, gerr->message);
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
|
|
@ -1164,7 +1164,7 @@ static void create_commit_message(struct membuffer *msg, bool create_empty)
|
|||
}
|
||||
put_format(msg, "Created by %s\n", subsurface_user_agent().c_str());
|
||||
if (verbose)
|
||||
SSRF_INFO("Commit message:\n\n%s\n", mb_cstring(msg));
|
||||
report_info("Commit message:\n\n%s\n", mb_cstring(msg));
|
||||
}
|
||||
|
||||
static int create_new_commit(struct git_info *info, git_oid *tree_id, bool create_empty)
|
||||
|
|
@ -1193,7 +1193,7 @@ static int create_new_commit(struct git_info *info, git_oid *tree_id, bool creat
|
|||
|
||||
if (!saved_git_id.empty()) {
|
||||
if (existing_filename && verbose)
|
||||
SSRF_INFO("existing filename %s\n", existing_filename);
|
||||
report_info("existing filename %s\n", existing_filename);
|
||||
const git_oid *id = git_commit_id((const git_commit *) parent);
|
||||
/* if we are saving to the same git tree we got this from, let's make
|
||||
* sure there is no confusion */
|
||||
|
|
@ -1288,7 +1288,7 @@ static int write_git_tree(git_repository *repo, const struct dir *tree, git_oid
|
|||
if (ret && verbose) {
|
||||
const git_error *gerr = giterr_last();
|
||||
if (gerr)
|
||||
SSRF_INFO("tree_insert failed with return %d error %s\n", ret, gerr->message);
|
||||
report_info("tree_insert failed with return %d error %s\n", ret, gerr->message);
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
|
@ -1304,7 +1304,7 @@ extern "C" int do_git_save(struct git_info *info, bool select_only, bool create_
|
|||
return report_error("Unable to open git repository '%s[%s]'", info->url, info->branch);
|
||||
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage: do git save\n");
|
||||
report_info("git storage: do git save\n");
|
||||
|
||||
if (!create_empty) // so we are actually saving the dives
|
||||
git_storage_update_progress(translate("gettextFromC", "Preparing to save data"));
|
||||
|
|
@ -1325,7 +1325,7 @@ extern "C" int do_git_save(struct git_info *info, bool select_only, bool create_
|
|||
return -1;
|
||||
|
||||
if (verbose)
|
||||
SSRF_INFO("git storage, write git tree\n");
|
||||
report_info("git storage, write git tree\n");
|
||||
|
||||
if (write_git_tree(info->repo, &tree, &id))
|
||||
return report_error("git tree write failed");
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ void add_dive_to_trip(struct dive *dive, dive_trip_t *trip)
|
|||
if (dive->divetrip == trip)
|
||||
return;
|
||||
if (dive->divetrip)
|
||||
SSRF_INFO("Warning: adding dive to trip that has trip set\n");
|
||||
report_info("Warning: adding dive to trip that has trip set\n");
|
||||
insert_dive(&trip->dives, dive);
|
||||
dive->divetrip = trip;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@ QStringList DiveSiteSortedModel::allSiteNames() const
|
|||
// (more precisely: the core has more sites than the model is aware of),
|
||||
// we might get an invalid index.
|
||||
if (idx < 0 || idx > divelog.sites->nr) {
|
||||
SSRF_INFO("DiveSiteSortedModel::allSiteNames(): invalid index");
|
||||
report_info("DiveSiteSortedModel::allSiteNames(): invalid index");
|
||||
continue;
|
||||
}
|
||||
locationNames << QString(divelog.sites->dive_sites[idx]->name);
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ void MessageHandlerModel::addLog(QtMsgType type, const QString& message)
|
|||
beginInsertRows(QModelIndex(), rowCount(), rowCount());
|
||||
m_data.append({message, type});
|
||||
endInsertRows();
|
||||
SSRF_INFO("%s", qPrintable(message));
|
||||
report_info("%s", qPrintable(message));
|
||||
#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
|
||||
writeToAppLogFile(message);
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue