Commit 688f11b313a1cd629b736df1a076e0c24f81c4f7
2020-03-21T17:28:29
fix 'got fetch -q' which still produced some unintended output
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143
diff --git a/got/got.c b/got/got.c
index 631195e..fa79b12 100644
--- a/got/got.c
+++ b/got/got.c
@@ -1306,12 +1306,13 @@ done:
static const struct got_error *
create_ref(const char *refname, struct got_object_id *id,
- const char *id_str, struct got_repository *repo)
+ const char *id_str, int verbosity, struct got_repository *repo)
{
const struct got_error *err = NULL;
struct got_reference *ref;
- printf("Creating %s: %s\n", refname, id_str);
+ if (verbosity >= 0)
+ printf("Creating %s: %s\n", refname, id_str);
err = got_ref_alloc(&ref, refname, id);
if (err)
@@ -1324,7 +1325,7 @@ create_ref(const char *refname, struct got_object_id *id,
static const struct got_error *
update_ref(struct got_reference *ref, struct got_object_id *new_id,
- struct got_repository *repo)
+ int verbosity, struct got_repository *repo)
{
const struct got_error *err = NULL;
char *new_id_str = NULL;
@@ -1339,13 +1340,18 @@ update_ref(struct got_reference *ref, struct got_object_id *new_id,
err = got_ref_alloc(&new_ref, got_ref_get_name(ref), new_id);
if (err)
goto done;
- printf("Deleting symbolic reference %s -> %s\n",
- got_ref_get_name(ref), got_ref_get_symref_target(ref));
+ if (verbosity >= 0) {
+ printf("Deleting symbolic reference %s -> %s\n",
+ got_ref_get_name(ref),
+ got_ref_get_symref_target(ref));
+ }
err = got_ref_delete(ref, repo);
if (err)
goto done;
- printf("Setting %s to %s\n", got_ref_get_name(ref),
- new_id_str);
+ if (verbosity >= 0) {
+ printf("Setting %s to %s\n", got_ref_get_name(ref),
+ new_id_str);
+ }
err = got_ref_write(new_ref, repo);
if (err)
goto done;
@@ -1354,8 +1360,10 @@ update_ref(struct got_reference *ref, struct got_object_id *new_id,
if (err)
goto done;
if (got_object_id_cmp(old_id, new_id) != 0) {
- printf("Setting %s to %s\n",
- got_ref_get_name(ref), new_id_str);
+ if (verbosity >= 0) {
+ printf("Setting %s to %s\n",
+ got_ref_get_name(ref), new_id_str);
+ }
err = got_ref_change_ref(ref, new_id);
if (err)
goto done;
@@ -1381,7 +1389,7 @@ usage_fetch(void)
static const struct got_error *
delete_missing_refs(struct got_pathlist_head *their_refs,
- struct got_repository *repo)
+ int verbosity, struct got_repository *repo)
{
const struct got_error *err = NULL;
struct got_reflist_head my_refs;
@@ -1418,7 +1426,10 @@ delete_missing_refs(struct got_pathlist_head *their_refs,
if (err)
break;
- printf("Deleting %s: %s\n", got_ref_get_name(re->ref), id_str);
+ if (verbosity >= 0) {
+ printf("Deleting %s: %s\n",
+ got_ref_get_name(re->ref), id_str);
+ }
free(id_str);
err = got_ref_delete(re->ref, repo);
if (err)
@@ -1624,7 +1635,7 @@ cmd_fetch(int argc, char *argv[])
if (verbosity >= 0)
printf("Already up-to-date\n");
if (delete_refs)
- error = delete_missing_refs(&refs, repo);
+ error = delete_missing_refs(&refs, verbosity, repo);
goto done;
}
@@ -1654,11 +1665,12 @@ cmd_fetch(int argc, char *argv[])
if (error) {
if (error->code != GOT_ERR_NOT_REF)
goto done;
- error = create_ref(refname, id, id_str, repo);
+ error = create_ref(refname, id, id_str,
+ verbosity, repo);
if (error)
goto done;
} else {
- error = update_ref(ref, id, repo);
+ error = update_ref(ref, id, verbosity, repo);
got_ref_close(ref);
if (error)
goto done;
@@ -1675,11 +1687,11 @@ cmd_fetch(int argc, char *argv[])
if (error->code != GOT_ERR_NOT_REF)
goto done;
error = create_ref(remote_refname, id, id_str,
- repo);
+ verbosity, repo);
if (error)
goto done;
} else {
- error = update_ref(ref, id, repo);
+ error = update_ref(ref, id, verbosity, repo);
got_ref_close(ref);
if (error)
goto done;
@@ -1690,7 +1702,8 @@ cmd_fetch(int argc, char *argv[])
if (error) {
if (error->code != GOT_ERR_NOT_REF)
goto done;
- error = create_ref(refname, id, id_str, repo);
+ error = create_ref(refname, id, id_str,
+ verbosity, repo);
if (error)
goto done;
} else
@@ -1700,7 +1713,7 @@ cmd_fetch(int argc, char *argv[])
id_str = NULL;
}
if (delete_refs)
- error = delete_missing_refs(&refs, repo);
+ error = delete_missing_refs(&refs, verbosity, repo);
done:
if (fetchpid > 0) {
if (kill(fetchpid, SIGTERM) == -1)