Merge branch 'jk/fsck-doc'
[git/git.git] / builtin / fsck.c
index 1d98248..d26fb0a 100644 (file)
@@ -1,3 +1,4 @@
+#define USE_THE_INDEX_COMPATIBILITY_MACROS
 #include "builtin.h"
 #include "cache.h"
 #include "repository.h"
@@ -51,16 +52,24 @@ static int name_objects;
 
 static const char *describe_object(struct object *obj)
 {
-       static struct strbuf buf = STRBUF_INIT;
-       char *name = name_objects ?
-               lookup_decoration(fsck_walk_options.object_names, obj) : NULL;
+       static struct strbuf bufs[] = {
+               STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT
+       };
+       static int b = 0;
+       struct strbuf *buf;
+       char *name = NULL;
 
-       strbuf_reset(&buf);
-       strbuf_addstr(&buf, oid_to_hex(&obj->oid));
+       if (name_objects)
+               name = lookup_decoration(fsck_walk_options.object_names, obj);
+
+       buf = bufs + b;
+       b = (b + 1) % ARRAY_SIZE(bufs);
+       strbuf_reset(buf);
+       strbuf_addstr(buf, oid_to_hex(&obj->oid));
        if (name)
-               strbuf_addf(&buf, " (%s)", name);
+               strbuf_addf(buf, " (%s)", name);
 
-       return buf.buf;
+       return buf->buf;
 }
 
 static const char *printable_type(struct object *obj)
@@ -76,7 +85,7 @@ static const char *printable_type(struct object *obj)
 
        ret = type_name(obj->type);
        if (!ret)
-               ret = "unknown";
+               ret = _("unknown");
 
        return ret;
 }
@@ -104,25 +113,32 @@ static int fsck_config(const char *var, const char *value, void *cb)
        return git_default_config(var, value, cb);
 }
 
-static void objreport(struct object *obj, const char *msg_type,
-                       const char *err)
-{
-       fprintf(stderr, "%s in %s %s: %s\n",
-               msg_type, printable_type(obj), describe_object(obj), err);
-}
-
 static int objerror(struct object *obj, const char *err)
 {
        errors_found |= ERROR_OBJECT;
-       objreport(obj, "error", err);
+       /* TRANSLATORS: e.g. error in tree 01bfda: <more explanation> */
+       fprintf_ln(stderr, _("error in %s %s: %s"),
+                  printable_type(obj), describe_object(obj), err);
        return -1;
 }
 
 static int fsck_error_func(struct fsck_options *o,
        struct object *obj, int type, const char *message)
 {
-       objreport(obj, (type == FSCK_WARN) ? "warning" : "error", message);
-       return (type == FSCK_WARN) ? 0 : 1;
+       switch (type) {
+       case FSCK_WARN:
+               /* TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> */
+               fprintf_ln(stderr, _("warning in %s %s: %s"),
+                          printable_type(obj), describe_object(obj), message);
+               return 0;
+       case FSCK_ERROR:
+               /* TRANSLATORS: e.g. error in tree 01bfda: <more explanation> */
+               fprintf_ln(stderr, _("error in %s %s: %s"),
+                          printable_type(obj), describe_object(obj), message);
+               return 1;
+       default:
+               BUG("%d (FSCK_IGNORE?) should never trigger this callback", type);
+       }
 }
 
 static struct object_array pending;
@@ -138,17 +154,18 @@ static int mark_object(struct object *obj, int type, void *data, struct fsck_opt
         */
        if (!obj) {
                /* ... these references to parent->fld are safe here */
-               printf("broken link from %7s %s\n",
-                          printable_type(parent), describe_object(parent));
-               printf("broken link from %7s %s\n",
-                          (type == OBJ_ANY ? "unknown" : type_name(type)), "unknown");
+               printf_ln(_("broken link from %7s %s"),
+                         printable_type(parent), describe_object(parent));
+               printf_ln(_("broken link from %7s %s"),
+                         (type == OBJ_ANY ? _("unknown") : type_name(type)),
+                         _("unknown"));
                errors_found |= ERROR_REACHABLE;
                return 1;
        }
 
        if (type != OBJ_ANY && obj->type != type)
                /* ... and the reference to parent is safe here */
-               objerror(parent, "wrong object type in link");
+               objerror(parent, _("wrong object type in link"));
 
        if (obj->flags & REACHABLE)
                return 0;
@@ -164,10 +181,12 @@ static int mark_object(struct object *obj, int type, void *data, struct fsck_opt
 
        if (!(obj->flags & HAS_OBJ)) {
                if (parent && !has_object_file(&obj->oid)) {
-                       printf("broken link from %7s %s\n",
-                                printable_type(parent), describe_object(parent));
-                       printf("              to %7s %s\n",
-                                printable_type(obj), describe_object(obj));
+                       printf_ln(_("broken link from %7s %s\n"
+                                   "              to %7s %s"),
+                                 printable_type(parent),
+                                 describe_object(parent),
+                                 printable_type(obj),
+                                 describe_object(obj));
                        errors_found |= ERROR_REACHABLE;
                }
                return 1;
@@ -273,8 +292,8 @@ static void check_reachable_object(struct object *obj)
                        return;
                if (has_object_pack(&obj->oid))
                        return; /* it is in pack - forget about it */
-               printf("missing %s %s\n", printable_type(obj),
-                       describe_object(obj));
+               printf_ln(_("missing %s %s"), printable_type(obj),
+                         describe_object(obj));
                errors_found |= ERROR_REACHABLE;
                return;
        }
@@ -299,8 +318,8 @@ static void check_unreachable_object(struct object *obj)
         * since this is something that is prunable.
         */
        if (show_unreachable) {
-               printf("unreachable %s %s\n", printable_type(obj),
-                       describe_object(obj));
+               printf_ln(_("unreachable %s %s"), printable_type(obj),
+                         describe_object(obj));
                return;
        }
 
@@ -318,8 +337,8 @@ static void check_unreachable_object(struct object *obj)
         */
        if (!(obj->flags & USED)) {
                if (show_dangling)
-                       printf("dangling %s %s\n", printable_type(obj),
-                              describe_object(obj));
+                       printf_ln(_("dangling %s %s"), printable_type(obj),
+                                 describe_object(obj));
                if (write_lost_and_found) {
                        char *filename = git_pathdup("lost-found/%s/%s",
                                obj->type == OBJ_COMMIT ? "commit" : "other",
@@ -327,18 +346,18 @@ static void check_unreachable_object(struct object *obj)
                        FILE *f;
 
                        if (safe_create_leading_directories_const(filename)) {
-                               error("Could not create lost-found");
+                               error(_("could not create lost-found"));
                                free(filename);
                                return;
                        }
                        f = xfopen(filename, "w");
                        if (obj->type == OBJ_BLOB) {
                                if (stream_blob_to_fd(fileno(f), &obj->oid, NULL, 1))
-                                       die_errno("Could not write '%s'", filename);
+                                       die_errno(_("could not write '%s'"), filename);
                        } else
                                fprintf(f, "%s\n", describe_object(obj));
                        if (fclose(f))
-                               die_errno("Could not finish '%s'",
+                               die_errno(_("could not finish '%s'"),
                                          filename);
                        free(filename);
                }
@@ -355,7 +374,7 @@ static void check_unreachable_object(struct object *obj)
 static void check_object(struct object *obj)
 {
        if (verbose)
-               fprintf(stderr, "Checking %s\n", describe_object(obj));
+               fprintf_ln(stderr, _("Checking %s"), describe_object(obj));
 
        if (obj->flags & REACHABLE)
                check_reachable_object(obj);
@@ -393,7 +412,7 @@ static void check_connectivity(void)
        /* Look up all the requirements, warn about missing objects.. */
        max = get_max_object_index();
        if (verbose)
-               fprintf(stderr, "Checking connectivity (%d objects)\n", max);
+               fprintf_ln(stderr, _("Checking connectivity (%d objects)"), max);
 
        for (i = 0; i < max; i++) {
                struct object *obj = get_indexed_object(i);
@@ -412,11 +431,11 @@ static int fsck_obj(struct object *obj, void *buffer, unsigned long size)
        obj->flags |= SEEN;
 
        if (verbose)
-               fprintf(stderr, "Checking %s %s\n",
-                       printable_type(obj), describe_object(obj));
+               fprintf_ln(stderr, _("Checking %s %s"),
+                          printable_type(obj), describe_object(obj));
 
        if (fsck_walk(obj, NULL, &fsck_obj_options))
-               objerror(obj, "broken links");
+               objerror(obj, _("broken links"));
        err = fsck_object(obj, buffer, size, &fsck_obj_options);
        if (err)
                goto out;
@@ -425,17 +444,19 @@ static int fsck_obj(struct object *obj, void *buffer, unsigned long size)
                struct commit *commit = (struct commit *) obj;
 
                if (!commit->parents && show_root)
-                       printf("root %s\n", describe_object(&commit->object));
+                       printf_ln(_("root %s"),
+                                 describe_object(&commit->object));
        }
 
        if (obj->type == OBJ_TAG) {
                struct tag *tag = (struct tag *) obj;
 
                if (show_tags && tag->tagged) {
-                       printf("tagged %s %s", printable_type(tag->tagged),
-                               describe_object(tag->tagged));
-                       printf(" (%s) in %s\n", tag->tag,
-                               describe_object(&tag->object));
+                       printf_ln(_("tagged %s %s (%s) in %s"),
+                                 printable_type(tag->tagged),
+                                 describe_object(tag->tagged),
+                                 tag->tag,
+                                 describe_object(&tag->object));
                }
        }
 
@@ -443,7 +464,8 @@ out:
        if (obj->type == OBJ_TREE)
                free_tree_buffer((struct tree *)obj);
        if (obj->type == OBJ_COMMIT)
-               free_commit_buffer((struct commit *)obj);
+               free_commit_buffer(the_repository->parsed_objects,
+                                  (struct commit *)obj);
        return err;
 }
 
@@ -459,7 +481,8 @@ static int fsck_obj_buffer(const struct object_id *oid, enum object_type type,
                                  eaten);
        if (!obj) {
                errors_found |= ERROR_OBJECT;
-               return error("%s: object corrupt or missing", oid_to_hex(oid));
+               return error(_("%s: object corrupt or missing"),
+                            oid_to_hex(oid));
        }
        obj->flags &= ~(REACHABLE | SEEN);
        obj->flags |= HAS_OBJ;
@@ -483,7 +506,8 @@ static void fsck_handle_reflog_oid(const char *refname, struct object_id *oid,
                        obj->flags |= USED;
                        mark_object_reachable(obj);
                } else if (!is_promisor_object(oid)) {
-                       error("%s: invalid reflog entry %s", refname, oid_to_hex(oid));
+                       error(_("%s: invalid reflog entry %s"),
+                             refname, oid_to_hex(oid));
                        errors_found |= ERROR_REACHABLE;
                }
        }
@@ -496,8 +520,8 @@ static int fsck_handle_reflog_ent(struct object_id *ooid, struct object_id *noid
        const char *refname = cb_data;
 
        if (verbose)
-               fprintf(stderr, "Checking reflog %s->%s\n",
-                       oid_to_hex(ooid), oid_to_hex(noid));
+               fprintf_ln(stderr, _("Checking reflog %s->%s"),
+                          oid_to_hex(ooid), oid_to_hex(noid));
 
        fsck_handle_reflog_oid(refname, ooid, 0);
        fsck_handle_reflog_oid(refname, noid, timestamp);
@@ -530,13 +554,14 @@ static int fsck_handle_ref(const char *refname, const struct object_id *oid,
                         default_refs++;
                         return 0;
                }
-               error("%s: invalid sha1 pointer %s", refname, oid_to_hex(oid));
+               error(_("%s: invalid sha1 pointer %s"),
+                     refname, oid_to_hex(oid));
                errors_found |= ERROR_REACHABLE;
                /* We'll continue with the rest despite the error.. */
                return 0;
        }
        if (obj->type != OBJ_COMMIT && is_branch(refname)) {
-               error("%s: not a commit", refname);
+               error(_("%s: not a commit"), refname);
                errors_found |= ERROR_REFS;
        }
        default_refs++;
@@ -591,7 +616,7 @@ static void get_default_heads(void)
         * "show_unreachable" flag.
         */
        if (!default_refs) {
-               fprintf(stderr, "notice: No default references\n");
+               fprintf_ln(stderr, _("notice: No default references"));
                show_unreachable = 0;
        }
 }
@@ -606,7 +631,7 @@ static int fsck_loose(const struct object_id *oid, const char *path, void *data)
 
        if (read_loose_object(path, oid, &type, &size, &contents) < 0) {
                errors_found |= ERROR_OBJECT;
-               error("%s: object corrupt or missing: %s",
+               error(_("%s: object corrupt or missing: %s"),
                      oid_to_hex(oid), path);
                return 0; /* keep checking other objects */
        }
@@ -619,7 +644,7 @@ static int fsck_loose(const struct object_id *oid, const char *path, void *data)
 
        if (!obj) {
                errors_found |= ERROR_OBJECT;
-               error("%s: object could not be parsed: %s",
+               error(_("%s: object could not be parsed: %s"),
                      oid_to_hex(oid), path);
                if (!eaten)
                        free(contents);
@@ -639,7 +664,7 @@ static int fsck_loose(const struct object_id *oid, const char *path, void *data)
 static int fsck_cruft(const char *basename, const char *path, void *data)
 {
        if (!starts_with(basename, "tmp_obj_"))
-               fprintf(stderr, "bad sha1 file: %s\n", path);
+               fprintf_ln(stderr, _("bad sha1 file: %s"), path);
        return 0;
 }
 
@@ -654,7 +679,7 @@ static void fsck_object_dir(const char *path)
        struct progress *progress = NULL;
 
        if (verbose)
-               fprintf(stderr, "Checking object directory\n");
+               fprintf_ln(stderr, _("Checking object directory"));
 
        if (show_progress)
                progress = start_progress(_("Checking object directories"), 256);
@@ -672,29 +697,30 @@ static int fsck_head_link(const char *head_ref_name,
        int null_is_error = 0;
 
        if (verbose)
-               fprintf(stderr, "Checking %s link\n", head_ref_name);
+               fprintf_ln(stderr, _("Checking %s link"), head_ref_name);
 
        *head_points_at = resolve_ref_unsafe(head_ref_name, 0, head_oid, NULL);
        if (!*head_points_at) {
                errors_found |= ERROR_REFS;
-               return error("Invalid %s", head_ref_name);
+               return error(_("invalid %s"), head_ref_name);
        }
        if (!strcmp(*head_points_at, head_ref_name))
                /* detached HEAD */
                null_is_error = 1;
        else if (!starts_with(*head_points_at, "refs/heads/")) {
                errors_found |= ERROR_REFS;
-               return error("%s points to something strange (%s)",
+               return error(_("%s points to something strange (%s)"),
                             head_ref_name, *head_points_at);
        }
        if (is_null_oid(head_oid)) {
                if (null_is_error) {
                        errors_found |= ERROR_REFS;
-                       return error("%s: detached HEAD points at nothing",
+                       return error(_("%s: detached HEAD points at nothing"),
                                     head_ref_name);
                }
-               fprintf(stderr, "notice: %s points to an unborn branch (%s)\n",
-                       head_ref_name, *head_points_at + 11);
+               fprintf_ln(stderr,
+                          _("notice: %s points to an unborn branch (%s)"),
+                          head_ref_name, *head_points_at + 11);
        }
        return 0;
 }
@@ -705,12 +731,12 @@ static int fsck_cache_tree(struct cache_tree *it)
        int err = 0;
 
        if (verbose)
-               fprintf(stderr, "Checking cache tree\n");
+               fprintf_ln(stderr, _("Checking cache tree"));
 
        if (0 <= it->entry_count) {
                struct object *obj = parse_object(the_repository, &it->oid);
                if (!obj) {
-                       error("%s: invalid sha1 pointer in cache-tree",
+                       error(_("%s: invalid sha1 pointer in cache-tree"),
                              oid_to_hex(&it->oid));
                        errors_found |= ERROR_REFS;
                        return 1;
@@ -721,7 +747,7 @@ static int fsck_cache_tree(struct cache_tree *it)
                                obj, xstrdup(":"));
                mark_object_reachable(obj);
                if (obj->type != OBJ_TREE)
-                       err |= objerror(obj, "non-tree in cache-tree");
+                       err |= objerror(obj, _("non-tree in cache-tree"));
        }
        for (i = 0; i < it->subtree_nr; i++)
                err |= fsck_cache_tree(it->down[i]->cache_tree);
@@ -777,7 +803,7 @@ static struct option fsck_opts[] = {
 int cmd_fsck(int argc, const char **argv, const char *prefix)
 {
        int i;
-       struct alternate_object_database *alt;
+       struct object_directory *odb;
 
        /* fsck knows how to handle missing promisor objects */
        fetch_if_missing = 0;
@@ -813,14 +839,9 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
                for_each_loose_object(mark_loose_for_connectivity, NULL, 0);
                for_each_packed_object(mark_packed_for_connectivity, NULL, 0);
        } else {
-               struct alternate_object_database *alt_odb_list;
-
-               fsck_object_dir(get_object_directory());
-
                prepare_alt_odb(the_repository);
-               alt_odb_list = the_repository->objects->alt_odb_list;
-               for (alt = alt_odb_list; alt; alt = alt->next)
-                       fsck_object_dir(alt->path);
+               for (odb = the_repository->objects->odb; odb; odb = odb->next)
+                       fsck_object_dir(odb->path);
 
                if (check_full) {
                        struct packed_git *p;
@@ -840,7 +861,8 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
                        for (p = get_all_packs(the_repository); p;
                             p = p->next) {
                                /* verify gives error messages itself */
-                               if (verify_pack(p, fsck_obj_buffer,
+                               if (verify_pack(the_repository,
+                                               p, fsck_obj_buffer,
                                                progress, count))
                                        errors_found |= ERROR_PACK;
                                count += p->num_objects;
@@ -862,7 +884,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
                        if (!obj || !(obj->flags & HAS_OBJ)) {
                                if (is_promisor_object(&oid))
                                        continue;
-                               error("%s: object missing", oid_to_hex(&oid));
+                               error(_("%s: object missing"), oid_to_hex(&oid));
                                errors_found |= ERROR_OBJECT;
                                continue;
                        }
@@ -874,7 +896,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
                        mark_object_reachable(obj);
                        continue;
                }
-               error("invalid parameter: expected sha1, got '%s'", arg);
+               error(_("invalid parameter: expected sha1, got '%s'"), arg);
                errors_found |= ERROR_OBJECT;
        }
 
@@ -922,15 +944,13 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
                struct child_process commit_graph_verify = CHILD_PROCESS_INIT;
                const char *verify_argv[] = { "commit-graph", "verify", NULL, NULL, NULL };
 
-               commit_graph_verify.argv = verify_argv;
-               commit_graph_verify.git_cmd = 1;
-               if (run_command(&commit_graph_verify))
-                       errors_found |= ERROR_COMMIT_GRAPH;
-
                prepare_alt_odb(the_repository);
-               for (alt =  the_repository->objects->alt_odb_list; alt; alt = alt->next) {
+               for (odb = the_repository->objects->odb; odb; odb = odb->next) {
+                       child_process_init(&commit_graph_verify);
+                       commit_graph_verify.argv = verify_argv;
+                       commit_graph_verify.git_cmd = 1;
                        verify_argv[2] = "--object-dir";
-                       verify_argv[3] = alt->path;
+                       verify_argv[3] = odb->path;
                        if (run_command(&commit_graph_verify))
                                errors_found |= ERROR_COMMIT_GRAPH;
                }
@@ -940,15 +960,13 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
                struct child_process midx_verify = CHILD_PROCESS_INIT;
                const char *midx_argv[] = { "multi-pack-index", "verify", NULL, NULL, NULL };
 
-               midx_verify.argv = midx_argv;
-               midx_verify.git_cmd = 1;
-               if (run_command(&midx_verify))
-                       errors_found |= ERROR_COMMIT_GRAPH;
-
                prepare_alt_odb(the_repository);
-               for (alt =  the_repository->objects->alt_odb_list; alt; alt = alt->next) {
+               for (odb = the_repository->objects->odb; odb; odb = odb->next) {
+                       child_process_init(&midx_verify);
+                       midx_verify.argv = midx_argv;
+                       midx_verify.git_cmd = 1;
                        midx_argv[2] = "--object-dir";
-                       midx_argv[3] = alt->path;
+                       midx_argv[3] = odb->path;
                        if (run_command(&midx_verify))
                                errors_found |= ERROR_COMMIT_GRAPH;
                }