bundle.con commit blame: show "previous" information in --porcelain/--incremental format (96e1170)
   1#include "cache.h"
   2#include "bundle.h"
   3#include "object.h"
   4#include "commit.h"
   5#include "diff.h"
   6#include "revision.h"
   7#include "list-objects.h"
   8#include "run-command.h"
   9#include "refs.h"
  10
  11static const char bundle_signature[] = "# v2 git bundle\n";
  12
  13static void add_to_ref_list(const unsigned char *sha1, const char *name,
  14                struct ref_list *list)
  15{
  16        if (list->nr + 1 >= list->alloc) {
  17                list->alloc = alloc_nr(list->nr + 1);
  18                list->list = xrealloc(list->list,
  19                                list->alloc * sizeof(list->list[0]));
  20        }
  21        memcpy(list->list[list->nr].sha1, sha1, 20);
  22        list->list[list->nr].name = xstrdup(name);
  23        list->nr++;
  24}
  25
  26/* returns an fd */
  27int read_bundle_header(const char *path, struct bundle_header *header)
  28{
  29        char buffer[1024];
  30        int fd;
  31        long fpos;
  32        FILE *ffd = fopen(path, "rb");
  33
  34        if (!ffd)
  35                return error("could not open '%s'", path);
  36        if (!fgets(buffer, sizeof(buffer), ffd) ||
  37                        strcmp(buffer, bundle_signature)) {
  38                fclose(ffd);
  39                return error("'%s' does not look like a v2 bundle file", path);
  40        }
  41        while (fgets(buffer, sizeof(buffer), ffd)
  42                        && buffer[0] != '\n') {
  43                int is_prereq = buffer[0] == '-';
  44                int offset = is_prereq ? 1 : 0;
  45                int len = strlen(buffer);
  46                unsigned char sha1[20];
  47                struct ref_list *list = is_prereq ? &header->prerequisites
  48                        : &header->references;
  49                char delim;
  50
  51                if (len && buffer[len - 1] == '\n')
  52                        buffer[len - 1] = '\0';
  53                if (get_sha1_hex(buffer + offset, sha1)) {
  54                        warning("unrecognized header: %s", buffer);
  55                        continue;
  56                }
  57                delim = buffer[40 + offset];
  58                if (!isspace(delim) && (delim != '\0' || !is_prereq))
  59                        die ("invalid header: %s", buffer);
  60                add_to_ref_list(sha1, isspace(delim) ?
  61                                buffer + 41 + offset : "", list);
  62        }
  63        fpos = ftell(ffd);
  64        fclose(ffd);
  65        fd = open(path, O_RDONLY);
  66        if (fd < 0)
  67                return error("could not open '%s'", path);
  68        lseek(fd, fpos, SEEK_SET);
  69        return fd;
  70}
  71
  72static int list_refs(struct ref_list *r, int argc, const char **argv)
  73{
  74        int i;
  75
  76        for (i = 0; i < r->nr; i++) {
  77                if (argc > 1) {
  78                        int j;
  79                        for (j = 1; j < argc; j++)
  80                                if (!strcmp(r->list[i].name, argv[j]))
  81                                        break;
  82                        if (j == argc)
  83                                continue;
  84                }
  85                printf("%s %s\n", sha1_to_hex(r->list[i].sha1),
  86                                r->list[i].name);
  87        }
  88        return 0;
  89}
  90
  91#define PREREQ_MARK (1u<<16)
  92
  93int verify_bundle(struct bundle_header *header, int verbose)
  94{
  95        /*
  96         * Do fast check, then if any prereqs are missing then go line by line
  97         * to be verbose about the errors
  98         */
  99        struct ref_list *p = &header->prerequisites;
 100        struct rev_info revs;
 101        const char *argv[] = {NULL, "--all"};
 102        struct object_array refs;
 103        struct commit *commit;
 104        int i, ret = 0, req_nr;
 105        const char *message = "Repository lacks these prerequisite commits:";
 106
 107        init_revisions(&revs, NULL);
 108        for (i = 0; i < p->nr; i++) {
 109                struct ref_list_entry *e = p->list + i;
 110                struct object *o = parse_object(e->sha1);
 111                if (o) {
 112                        o->flags |= PREREQ_MARK;
 113                        add_pending_object(&revs, o, e->name);
 114                        continue;
 115                }
 116                if (++ret == 1)
 117                        error(message);
 118                error("%s %s", sha1_to_hex(e->sha1), e->name);
 119        }
 120        if (revs.pending.nr != p->nr)
 121                return ret;
 122        req_nr = revs.pending.nr;
 123        setup_revisions(2, argv, &revs, NULL);
 124
 125        memset(&refs, 0, sizeof(struct object_array));
 126        for (i = 0; i < revs.pending.nr; i++) {
 127                struct object_array_entry *e = revs.pending.objects + i;
 128                add_object_array(e->item, e->name, &refs);
 129        }
 130
 131        if (prepare_revision_walk(&revs))
 132                die("revision walk setup failed");
 133
 134        i = req_nr;
 135        while (i && (commit = get_revision(&revs)))
 136                if (commit->object.flags & PREREQ_MARK)
 137                        i--;
 138
 139        for (i = 0; i < req_nr; i++)
 140                if (!(refs.objects[i].item->flags & SHOWN)) {
 141                        if (++ret == 1)
 142                                error(message);
 143                        error("%s %s", sha1_to_hex(refs.objects[i].item->sha1),
 144                                refs.objects[i].name);
 145                }
 146
 147        for (i = 0; i < refs.nr; i++)
 148                clear_commit_marks((struct commit *)refs.objects[i].item, -1);
 149
 150        if (verbose) {
 151                struct ref_list *r;
 152
 153                r = &header->references;
 154                printf("The bundle contains %d ref%s\n",
 155                       r->nr, (1 < r->nr) ? "s" : "");
 156                list_refs(r, 0, NULL);
 157                r = &header->prerequisites;
 158                printf("The bundle requires these %d ref%s\n",
 159                       r->nr, (1 < r->nr) ? "s" : "");
 160                list_refs(r, 0, NULL);
 161        }
 162        return ret;
 163}
 164
 165int list_bundle_refs(struct bundle_header *header, int argc, const char **argv)
 166{
 167        return list_refs(&header->references, argc, argv);
 168}
 169
 170int create_bundle(struct bundle_header *header, const char *path,
 171                int argc, const char **argv)
 172{
 173        static struct lock_file lock;
 174        int bundle_fd = -1;
 175        int bundle_to_stdout;
 176        const char **argv_boundary = xmalloc((argc + 4) * sizeof(const char *));
 177        const char **argv_pack = xmalloc(5 * sizeof(const char *));
 178        int i, ref_count = 0;
 179        char buffer[1024];
 180        struct rev_info revs;
 181        int read_from_stdin = 0;
 182        struct child_process rls;
 183        FILE *rls_fout;
 184
 185        bundle_to_stdout = !strcmp(path, "-");
 186        if (bundle_to_stdout)
 187                bundle_fd = 1;
 188        else
 189                bundle_fd = hold_lock_file_for_update(&lock, path, 1);
 190
 191        /* write signature */
 192        write_or_die(bundle_fd, bundle_signature, strlen(bundle_signature));
 193
 194        /* init revs to list objects for pack-objects later */
 195        save_commit_buffer = 0;
 196        init_revisions(&revs, NULL);
 197
 198        /* write prerequisites */
 199        memcpy(argv_boundary + 3, argv + 1, argc * sizeof(const char *));
 200        argv_boundary[0] = "rev-list";
 201        argv_boundary[1] = "--boundary";
 202        argv_boundary[2] = "--pretty=oneline";
 203        argv_boundary[argc + 2] = NULL;
 204        memset(&rls, 0, sizeof(rls));
 205        rls.argv = argv_boundary;
 206        rls.out = -1;
 207        rls.git_cmd = 1;
 208        if (start_command(&rls))
 209                return -1;
 210        rls_fout = fdopen(rls.out, "r");
 211        while (fgets(buffer, sizeof(buffer), rls_fout)) {
 212                unsigned char sha1[20];
 213                if (buffer[0] == '-') {
 214                        write_or_die(bundle_fd, buffer, strlen(buffer));
 215                        if (!get_sha1_hex(buffer + 1, sha1)) {
 216                                struct object *object = parse_object(sha1);
 217                                object->flags |= UNINTERESTING;
 218                                add_pending_object(&revs, object, buffer);
 219                        }
 220                } else if (!get_sha1_hex(buffer, sha1)) {
 221                        struct object *object = parse_object(sha1);
 222                        object->flags |= SHOWN;
 223                }
 224        }
 225        fclose(rls_fout);
 226        if (finish_command(&rls))
 227                return error("rev-list died");
 228
 229        /* write references */
 230        argc = setup_revisions(argc, argv, &revs, NULL);
 231
 232        for (i = 1; i < argc; i++) {
 233                if (!strcmp(argv[i], "--stdin")) {
 234                        if (read_from_stdin++)
 235                                die("--stdin given twice?");
 236                        read_revisions_from_stdin(&revs);
 237                        continue;
 238                }
 239                return error("unrecognized argument: %s'", argv[i]);
 240        }
 241
 242        for (i = 0; i < revs.pending.nr; i++) {
 243                struct object_array_entry *e = revs.pending.objects + i;
 244                unsigned char sha1[20];
 245                char *ref;
 246                const char *display_ref;
 247                int flag;
 248
 249                if (e->item->flags & UNINTERESTING)
 250                        continue;
 251                if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1)
 252                        continue;
 253                if (!resolve_ref(e->name, sha1, 1, &flag))
 254                        flag = 0;
 255                display_ref = (flag & REF_ISSYMREF) ? e->name : ref;
 256
 257                /*
 258                 * Make sure the refs we wrote out is correct; --max-count and
 259                 * other limiting options could have prevented all the tips
 260                 * from getting output.
 261                 *
 262                 * Non commit objects such as tags and blobs do not have
 263                 * this issue as they are not affected by those extra
 264                 * constraints.
 265                 */
 266                if (!(e->item->flags & SHOWN) && e->item->type == OBJ_COMMIT) {
 267                        warning("ref '%s' is excluded by the rev-list options",
 268                                e->name);
 269                        free(ref);
 270                        continue;
 271                }
 272                /*
 273                 * If you run "git bundle create bndl v1.0..v2.0", the
 274                 * name of the positive ref is "v2.0" but that is the
 275                 * commit that is referenced by the tag, and not the tag
 276                 * itself.
 277                 */
 278                if (hashcmp(sha1, e->item->sha1)) {
 279                        /*
 280                         * Is this the positive end of a range expressed
 281                         * in terms of a tag (e.g. v2.0 from the range
 282                         * "v1.0..v2.0")?
 283                         */
 284                        struct commit *one = lookup_commit_reference(sha1);
 285                        struct object *obj;
 286
 287                        if (e->item == &(one->object)) {
 288                                /*
 289                                 * Need to include e->name as an
 290                                 * independent ref to the pack-objects
 291                                 * input, so that the tag is included
 292                                 * in the output; otherwise we would
 293                                 * end up triggering "empty bundle"
 294                                 * error.
 295                                 */
 296                                obj = parse_object(sha1);
 297                                obj->flags |= SHOWN;
 298                                add_pending_object(&revs, obj, e->name);
 299                        }
 300                        free(ref);
 301                        continue;
 302                }
 303
 304                ref_count++;
 305                write_or_die(bundle_fd, sha1_to_hex(e->item->sha1), 40);
 306                write_or_die(bundle_fd, " ", 1);
 307                write_or_die(bundle_fd, display_ref, strlen(display_ref));
 308                write_or_die(bundle_fd, "\n", 1);
 309                free(ref);
 310        }
 311        if (!ref_count)
 312                die ("Refusing to create empty bundle.");
 313
 314        /* end header */
 315        write_or_die(bundle_fd, "\n", 1);
 316
 317        /* write pack */
 318        argv_pack[0] = "pack-objects";
 319        argv_pack[1] = "--all-progress";
 320        argv_pack[2] = "--stdout";
 321        argv_pack[3] = "--thin";
 322        argv_pack[4] = NULL;
 323        memset(&rls, 0, sizeof(rls));
 324        rls.argv = argv_pack;
 325        rls.in = -1;
 326        rls.out = bundle_fd;
 327        rls.git_cmd = 1;
 328        if (start_command(&rls))
 329                return error("Could not spawn pack-objects");
 330
 331        /*
 332         * start_command closed bundle_fd if it was > 1
 333         * so set the lock fd to -1 so commit_lock_file()
 334         * won't fail trying to close it.
 335         */
 336        lock.fd = -1;
 337
 338        for (i = 0; i < revs.pending.nr; i++) {
 339                struct object *object = revs.pending.objects[i].item;
 340                if (object->flags & UNINTERESTING)
 341                        write_or_die(rls.in, "^", 1);
 342                write_or_die(rls.in, sha1_to_hex(object->sha1), 40);
 343                write_or_die(rls.in, "\n", 1);
 344        }
 345        close(rls.in);
 346        if (finish_command(&rls))
 347                return error ("pack-objects died");
 348        if (!bundle_to_stdout)
 349                commit_lock_file(&lock);
 350        return 0;
 351}
 352
 353int unbundle(struct bundle_header *header, int bundle_fd)
 354{
 355        const char *argv_index_pack[] = {"index-pack",
 356                "--fix-thin", "--stdin", NULL};
 357        struct child_process ip;
 358
 359        if (verify_bundle(header, 0))
 360                return -1;
 361        memset(&ip, 0, sizeof(ip));
 362        ip.argv = argv_index_pack;
 363        ip.in = bundle_fd;
 364        ip.no_stdout = 1;
 365        ip.git_cmd = 1;
 366        if (run_command(&ip))
 367                return error("index-pack died");
 368        return 0;
 369}