Merge branch 'pe/pull-rebase-v-q' into maint
[git] / builtin / fast-export.c
1 /*
2  * "git fast-export" builtin command
3  *
4  * Copyright (C) 2007 Johannes E. Schindelin
5  */
6 #include "builtin.h"
7 #include "cache.h"
8 #include "commit.h"
9 #include "object.h"
10 #include "tag.h"
11 #include "diff.h"
12 #include "diffcore.h"
13 #include "log-tree.h"
14 #include "revision.h"
15 #include "decorate.h"
16 #include "string-list.h"
17 #include "utf8.h"
18 #include "parse-options.h"
19 #include "quote.h"
20
21 static const char *fast_export_usage[] = {
22         N_("git fast-export [rev-list-opts]"),
23         NULL
24 };
25
26 static int progress;
27 static enum { ABORT, VERBATIM, WARN, STRIP } signed_tag_mode = ABORT;
28 static enum { ERROR, DROP, REWRITE } tag_of_filtered_mode = ERROR;
29 static int fake_missing_tagger;
30 static int use_done_feature;
31 static int no_data;
32 static int full_tree;
33
34 static int parse_opt_signed_tag_mode(const struct option *opt,
35                                      const char *arg, int unset)
36 {
37         if (unset || !strcmp(arg, "abort"))
38                 signed_tag_mode = ABORT;
39         else if (!strcmp(arg, "verbatim") || !strcmp(arg, "ignore"))
40                 signed_tag_mode = VERBATIM;
41         else if (!strcmp(arg, "warn"))
42                 signed_tag_mode = WARN;
43         else if (!strcmp(arg, "strip"))
44                 signed_tag_mode = STRIP;
45         else
46                 return error("Unknown signed-tags mode: %s", arg);
47         return 0;
48 }
49
50 static int parse_opt_tag_of_filtered_mode(const struct option *opt,
51                                           const char *arg, int unset)
52 {
53         if (unset || !strcmp(arg, "abort"))
54                 tag_of_filtered_mode = ERROR;
55         else if (!strcmp(arg, "drop"))
56                 tag_of_filtered_mode = DROP;
57         else if (!strcmp(arg, "rewrite"))
58                 tag_of_filtered_mode = REWRITE;
59         else
60                 return error("Unknown tag-of-filtered mode: %s", arg);
61         return 0;
62 }
63
64 static struct decoration idnums;
65 static uint32_t last_idnum;
66
67 static int has_unshown_parent(struct commit *commit)
68 {
69         struct commit_list *parent;
70
71         for (parent = commit->parents; parent; parent = parent->next)
72                 if (!(parent->item->object.flags & SHOWN) &&
73                     !(parent->item->object.flags & UNINTERESTING))
74                         return 1;
75         return 0;
76 }
77
78 /* Since intptr_t is C99, we do not use it here */
79 static inline uint32_t *mark_to_ptr(uint32_t mark)
80 {
81         return ((uint32_t *)NULL) + mark;
82 }
83
84 static inline uint32_t ptr_to_mark(void * mark)
85 {
86         return (uint32_t *)mark - (uint32_t *)NULL;
87 }
88
89 static inline void mark_object(struct object *object, uint32_t mark)
90 {
91         add_decoration(&idnums, object, mark_to_ptr(mark));
92 }
93
94 static inline void mark_next_object(struct object *object)
95 {
96         mark_object(object, ++last_idnum);
97 }
98
99 static int get_object_mark(struct object *object)
100 {
101         void *decoration = lookup_decoration(&idnums, object);
102         if (!decoration)
103                 return 0;
104         return ptr_to_mark(decoration);
105 }
106
107 static void show_progress(void)
108 {
109         static int counter = 0;
110         if (!progress)
111                 return;
112         if ((++counter % progress) == 0)
113                 printf("progress %d objects\n", counter);
114 }
115
116 static void handle_object(const unsigned char *sha1)
117 {
118         unsigned long size;
119         enum object_type type;
120         char *buf;
121         struct object *object;
122
123         if (no_data)
124                 return;
125
126         if (is_null_sha1(sha1))
127                 return;
128
129         object = parse_object(sha1);
130         if (!object)
131                 die ("Could not read blob %s", sha1_to_hex(sha1));
132
133         if (object->flags & SHOWN)
134                 return;
135
136         buf = read_sha1_file(sha1, &type, &size);
137         if (!buf)
138                 die ("Could not read blob %s", sha1_to_hex(sha1));
139
140         mark_next_object(object);
141
142         printf("blob\nmark :%"PRIu32"\ndata %lu\n", last_idnum, size);
143         if (size && fwrite(buf, size, 1, stdout) != 1)
144                 die_errno ("Could not write blob '%s'", sha1_to_hex(sha1));
145         printf("\n");
146
147         show_progress();
148
149         object->flags |= SHOWN;
150         free(buf);
151 }
152
153 static int depth_first(const void *a_, const void *b_)
154 {
155         const struct diff_filepair *a = *((const struct diff_filepair **)a_);
156         const struct diff_filepair *b = *((const struct diff_filepair **)b_);
157         const char *name_a, *name_b;
158         int len_a, len_b, len;
159         int cmp;
160
161         name_a = a->one ? a->one->path : a->two->path;
162         name_b = b->one ? b->one->path : b->two->path;
163
164         len_a = strlen(name_a);
165         len_b = strlen(name_b);
166         len = (len_a < len_b) ? len_a : len_b;
167
168         /* strcmp will sort 'd' before 'd/e', we want 'd/e' before 'd' */
169         cmp = memcmp(name_a, name_b, len);
170         if (cmp)
171                 return cmp;
172         cmp = len_b - len_a;
173         if (cmp)
174                 return cmp;
175         /*
176          * Move 'R'ename entries last so that all references of the file
177          * appear in the output before it is renamed (e.g., when a file
178          * was copied and renamed in the same commit).
179          */
180         return (a->status == 'R') - (b->status == 'R');
181 }
182
183 static void print_path(const char *path)
184 {
185         int need_quote = quote_c_style(path, NULL, NULL, 0);
186         if (need_quote)
187                 quote_c_style(path, NULL, stdout, 0);
188         else if (strchr(path, ' '))
189                 printf("\"%s\"", path);
190         else
191                 printf("%s", path);
192 }
193
194 static void show_filemodify(struct diff_queue_struct *q,
195                             struct diff_options *options, void *data)
196 {
197         int i;
198
199         /*
200          * Handle files below a directory first, in case they are all deleted
201          * and the directory changes to a file or symlink.
202          */
203         qsort(q->queue, q->nr, sizeof(q->queue[0]), depth_first);
204
205         for (i = 0; i < q->nr; i++) {
206                 struct diff_filespec *ospec = q->queue[i]->one;
207                 struct diff_filespec *spec = q->queue[i]->two;
208
209                 switch (q->queue[i]->status) {
210                 case DIFF_STATUS_DELETED:
211                         printf("D ");
212                         print_path(spec->path);
213                         putchar('\n');
214                         break;
215
216                 case DIFF_STATUS_COPIED:
217                 case DIFF_STATUS_RENAMED:
218                         printf("%c ", q->queue[i]->status);
219                         print_path(ospec->path);
220                         putchar(' ');
221                         print_path(spec->path);
222                         putchar('\n');
223
224                         if (!hashcmp(ospec->sha1, spec->sha1) &&
225                             ospec->mode == spec->mode)
226                                 break;
227                         /* fallthrough */
228
229                 case DIFF_STATUS_TYPE_CHANGED:
230                 case DIFF_STATUS_MODIFIED:
231                 case DIFF_STATUS_ADDED:
232                         /*
233                          * Links refer to objects in another repositories;
234                          * output the SHA-1 verbatim.
235                          */
236                         if (no_data || S_ISGITLINK(spec->mode))
237                                 printf("M %06o %s ", spec->mode,
238                                        sha1_to_hex(spec->sha1));
239                         else {
240                                 struct object *object = lookup_object(spec->sha1);
241                                 printf("M %06o :%d ", spec->mode,
242                                        get_object_mark(object));
243                         }
244                         print_path(spec->path);
245                         putchar('\n');
246                         break;
247
248                 default:
249                         die("Unexpected comparison status '%c' for %s, %s",
250                                 q->queue[i]->status,
251                                 ospec->path ? ospec->path : "none",
252                                 spec->path ? spec->path : "none");
253                 }
254         }
255 }
256
257 static const char *find_encoding(const char *begin, const char *end)
258 {
259         const char *needle = "\nencoding ";
260         char *bol, *eol;
261
262         bol = memmem(begin, end ? end - begin : strlen(begin),
263                      needle, strlen(needle));
264         if (!bol)
265                 return git_commit_encoding;
266         bol += strlen(needle);
267         eol = strchrnul(bol, '\n');
268         *eol = '\0';
269         return bol;
270 }
271
272 static void handle_commit(struct commit *commit, struct rev_info *rev)
273 {
274         int saved_output_format = rev->diffopt.output_format;
275         const char *author, *author_end, *committer, *committer_end;
276         const char *encoding, *message;
277         char *reencoded = NULL;
278         struct commit_list *p;
279         int i;
280
281         rev->diffopt.output_format = DIFF_FORMAT_CALLBACK;
282
283         parse_commit(commit);
284         author = strstr(commit->buffer, "\nauthor ");
285         if (!author)
286                 die ("Could not find author in commit %s",
287                      sha1_to_hex(commit->object.sha1));
288         author++;
289         author_end = strchrnul(author, '\n');
290         committer = strstr(author_end, "\ncommitter ");
291         if (!committer)
292                 die ("Could not find committer in commit %s",
293                      sha1_to_hex(commit->object.sha1));
294         committer++;
295         committer_end = strchrnul(committer, '\n');
296         message = strstr(committer_end, "\n\n");
297         encoding = find_encoding(committer_end, message);
298         if (message)
299                 message += 2;
300
301         if (commit->parents &&
302             get_object_mark(&commit->parents->item->object) != 0 &&
303             !full_tree) {
304                 parse_commit(commit->parents->item);
305                 diff_tree_sha1(commit->parents->item->tree->object.sha1,
306                                commit->tree->object.sha1, "", &rev->diffopt);
307         }
308         else
309                 diff_root_tree_sha1(commit->tree->object.sha1,
310                                     "", &rev->diffopt);
311
312         /* Export the referenced blobs, and remember the marks. */
313         for (i = 0; i < diff_queued_diff.nr; i++)
314                 if (!S_ISGITLINK(diff_queued_diff.queue[i]->two->mode))
315                         handle_object(diff_queued_diff.queue[i]->two->sha1);
316
317         mark_next_object(&commit->object);
318         if (!is_encoding_utf8(encoding))
319                 reencoded = reencode_string(message, "UTF-8", encoding);
320         if (!commit->parents)
321                 printf("reset %s\n", (const char*)commit->util);
322         printf("commit %s\nmark :%"PRIu32"\n%.*s\n%.*s\ndata %u\n%s",
323                (const char *)commit->util, last_idnum,
324                (int)(author_end - author), author,
325                (int)(committer_end - committer), committer,
326                (unsigned)(reencoded
327                           ? strlen(reencoded) : message
328                           ? strlen(message) : 0),
329                reencoded ? reencoded : message ? message : "");
330         free(reencoded);
331
332         for (i = 0, p = commit->parents; p; p = p->next) {
333                 int mark = get_object_mark(&p->item->object);
334                 if (!mark)
335                         continue;
336                 if (i == 0)
337                         printf("from :%d\n", mark);
338                 else
339                         printf("merge :%d\n", mark);
340                 i++;
341         }
342
343         if (full_tree)
344                 printf("deleteall\n");
345         log_tree_diff_flush(rev);
346         rev->diffopt.output_format = saved_output_format;
347
348         printf("\n");
349
350         show_progress();
351 }
352
353 static void handle_tail(struct object_array *commits, struct rev_info *revs)
354 {
355         struct commit *commit;
356         while (commits->nr) {
357                 commit = (struct commit *)commits->objects[commits->nr - 1].item;
358                 if (has_unshown_parent(commit))
359                         return;
360                 handle_commit(commit, revs);
361                 commits->nr--;
362         }
363 }
364
365 static void handle_tag(const char *name, struct tag *tag)
366 {
367         unsigned long size;
368         enum object_type type;
369         char *buf;
370         const char *tagger, *tagger_end, *message;
371         size_t message_size = 0;
372         struct object *tagged;
373         int tagged_mark;
374         struct commit *p;
375
376         /* Trees have no identifer in fast-export output, thus we have no way
377          * to output tags of trees, tags of tags of trees, etc.  Simply omit
378          * such tags.
379          */
380         tagged = tag->tagged;
381         while (tagged->type == OBJ_TAG) {
382                 tagged = ((struct tag *)tagged)->tagged;
383         }
384         if (tagged->type == OBJ_TREE) {
385                 warning("Omitting tag %s,\nsince tags of trees (or tags of tags of trees, etc.) are not supported.",
386                         sha1_to_hex(tag->object.sha1));
387                 return;
388         }
389
390         buf = read_sha1_file(tag->object.sha1, &type, &size);
391         if (!buf)
392                 die ("Could not read tag %s", sha1_to_hex(tag->object.sha1));
393         message = memmem(buf, size, "\n\n", 2);
394         if (message) {
395                 message += 2;
396                 message_size = strlen(message);
397         }
398         tagger = memmem(buf, message ? message - buf : size, "\ntagger ", 8);
399         if (!tagger) {
400                 if (fake_missing_tagger)
401                         tagger = "tagger Unspecified Tagger "
402                                 "<unspecified-tagger> 0 +0000";
403                 else
404                         tagger = "";
405                 tagger_end = tagger + strlen(tagger);
406         } else {
407                 tagger++;
408                 tagger_end = strchrnul(tagger, '\n');
409         }
410
411         /* handle signed tags */
412         if (message) {
413                 const char *signature = strstr(message,
414                                                "\n-----BEGIN PGP SIGNATURE-----\n");
415                 if (signature)
416                         switch(signed_tag_mode) {
417                         case ABORT:
418                                 die ("Encountered signed tag %s; use "
419                                      "--signed-tags=<mode> to handle it.",
420                                      sha1_to_hex(tag->object.sha1));
421                         case WARN:
422                                 warning ("Exporting signed tag %s",
423                                          sha1_to_hex(tag->object.sha1));
424                                 /* fallthru */
425                         case VERBATIM:
426                                 break;
427                         case STRIP:
428                                 message_size = signature + 1 - message;
429                                 break;
430                         }
431         }
432
433         /* handle tag->tagged having been filtered out due to paths specified */
434         tagged = tag->tagged;
435         tagged_mark = get_object_mark(tagged);
436         if (!tagged_mark) {
437                 switch(tag_of_filtered_mode) {
438                 case ABORT:
439                         die ("Tag %s tags unexported object; use "
440                              "--tag-of-filtered-object=<mode> to handle it.",
441                              sha1_to_hex(tag->object.sha1));
442                 case DROP:
443                         /* Ignore this tag altogether */
444                         return;
445                 case REWRITE:
446                         if (tagged->type != OBJ_COMMIT) {
447                                 die ("Tag %s tags unexported %s!",
448                                      sha1_to_hex(tag->object.sha1),
449                                      typename(tagged->type));
450                         }
451                         p = (struct commit *)tagged;
452                         for (;;) {
453                                 if (p->parents && p->parents->next)
454                                         break;
455                                 if (p->object.flags & UNINTERESTING)
456                                         break;
457                                 if (!(p->object.flags & TREESAME))
458                                         break;
459                                 if (!p->parents)
460                                         die ("Can't find replacement commit for tag %s\n",
461                                              sha1_to_hex(tag->object.sha1));
462                                 p = p->parents->item;
463                         }
464                         tagged_mark = get_object_mark(&p->object);
465                 }
466         }
467
468         if (!prefixcmp(name, "refs/tags/"))
469                 name += 10;
470         printf("tag %s\nfrom :%d\n%.*s%sdata %d\n%.*s\n",
471                name, tagged_mark,
472                (int)(tagger_end - tagger), tagger,
473                tagger == tagger_end ? "" : "\n",
474                (int)message_size, (int)message_size, message ? message : "");
475 }
476
477 static void get_tags_and_duplicates(struct rev_cmdline_info *info,
478                                     struct string_list *extra_refs)
479 {
480         struct tag *tag;
481         int i;
482
483         for (i = 0; i < info->nr; i++) {
484                 struct rev_cmdline_entry *e = info->rev + i;
485                 unsigned char sha1[20];
486                 struct commit *commit;
487                 char *full_name;
488
489                 if (e->flags & UNINTERESTING)
490                         continue;
491
492                 if (dwim_ref(e->name, strlen(e->name), sha1, &full_name) != 1)
493                         continue;
494
495                 switch (e->item->type) {
496                 case OBJ_COMMIT:
497                         commit = (struct commit *)e->item;
498                         break;
499                 case OBJ_TAG:
500                         tag = (struct tag *)e->item;
501
502                         /* handle nested tags */
503                         while (tag && tag->object.type == OBJ_TAG) {
504                                 parse_object(tag->object.sha1);
505                                 string_list_append(extra_refs, full_name)->util = tag;
506                                 tag = (struct tag *)tag->tagged;
507                         }
508                         if (!tag)
509                                 die ("Tag %s points nowhere?", e->name);
510                         switch(tag->object.type) {
511                         case OBJ_COMMIT:
512                                 commit = (struct commit *)tag;
513                                 break;
514                         case OBJ_BLOB:
515                                 handle_object(tag->object.sha1);
516                                 continue;
517                         default: /* OBJ_TAG (nested tags) is already handled */
518                                 warning("Tag points to object of unexpected type %s, skipping.",
519                                         typename(tag->object.type));
520                                 continue;
521                         }
522                         break;
523                 default:
524                         warning("%s: Unexpected object of type %s, skipping.",
525                                 e->name,
526                                 typename(e->item->type));
527                         continue;
528                 }
529
530                 /*
531                  * This ref will not be updated through a commit, lets make
532                  * sure it gets properly updated eventually.
533                  */
534                 if (commit->util || commit->object.flags & SHOWN)
535                         string_list_append(extra_refs, full_name)->util = commit;
536                 if (!commit->util)
537                         commit->util = full_name;
538         }
539 }
540
541 static void handle_tags_and_duplicates(struct string_list *extra_refs)
542 {
543         struct commit *commit;
544         int i;
545
546         for (i = extra_refs->nr - 1; i >= 0; i--) {
547                 const char *name = extra_refs->items[i].string;
548                 struct object *object = extra_refs->items[i].util;
549                 switch (object->type) {
550                 case OBJ_TAG:
551                         handle_tag(name, (struct tag *)object);
552                         break;
553                 case OBJ_COMMIT:
554                         /* create refs pointing to already seen commits */
555                         commit = (struct commit *)object;
556                         printf("reset %s\nfrom :%d\n\n", name,
557                                get_object_mark(&commit->object));
558                         show_progress();
559                         break;
560                 }
561         }
562 }
563
564 static void export_marks(char *file)
565 {
566         unsigned int i;
567         uint32_t mark;
568         struct object_decoration *deco = idnums.hash;
569         FILE *f;
570         int e = 0;
571
572         f = fopen(file, "w");
573         if (!f)
574                 die_errno("Unable to open marks file %s for writing.", file);
575
576         for (i = 0; i < idnums.size; i++) {
577                 if (deco->base && deco->base->type == 1) {
578                         mark = ptr_to_mark(deco->decoration);
579                         if (fprintf(f, ":%"PRIu32" %s\n", mark,
580                                 sha1_to_hex(deco->base->sha1)) < 0) {
581                             e = 1;
582                             break;
583                         }
584                 }
585                 deco++;
586         }
587
588         e |= ferror(f);
589         e |= fclose(f);
590         if (e)
591                 error("Unable to write marks file %s.", file);
592 }
593
594 static void import_marks(char *input_file)
595 {
596         char line[512];
597         FILE *f = fopen(input_file, "r");
598         if (!f)
599                 die_errno("cannot read '%s'", input_file);
600
601         while (fgets(line, sizeof(line), f)) {
602                 uint32_t mark;
603                 char *line_end, *mark_end;
604                 unsigned char sha1[20];
605                 struct object *object;
606
607                 line_end = strchr(line, '\n');
608                 if (line[0] != ':' || !line_end)
609                         die("corrupt mark line: %s", line);
610                 *line_end = '\0';
611
612                 mark = strtoumax(line + 1, &mark_end, 10);
613                 if (!mark || mark_end == line + 1
614                         || *mark_end != ' ' || get_sha1(mark_end + 1, sha1))
615                         die("corrupt mark line: %s", line);
616
617                 object = parse_object(sha1);
618                 if (!object)
619                         die ("Could not read blob %s", sha1_to_hex(sha1));
620
621                 if (object->flags & SHOWN)
622                         error("Object %s already has a mark", sha1_to_hex(sha1));
623
624                 if (object->type != OBJ_COMMIT)
625                         /* only commits */
626                         continue;
627
628                 mark_object(object, mark);
629                 if (last_idnum < mark)
630                         last_idnum = mark;
631
632                 object->flags |= SHOWN;
633         }
634         fclose(f);
635 }
636
637 int cmd_fast_export(int argc, const char **argv, const char *prefix)
638 {
639         struct rev_info revs;
640         struct object_array commits = OBJECT_ARRAY_INIT;
641         struct string_list extra_refs = STRING_LIST_INIT_NODUP;
642         struct commit *commit;
643         char *export_filename = NULL, *import_filename = NULL;
644         struct option options[] = {
645                 OPT_INTEGER(0, "progress", &progress,
646                             N_("show progress after <n> objects")),
647                 OPT_CALLBACK(0, "signed-tags", &signed_tag_mode, N_("mode"),
648                              N_("select handling of signed tags"),
649                              parse_opt_signed_tag_mode),
650                 OPT_CALLBACK(0, "tag-of-filtered-object", &tag_of_filtered_mode, N_("mode"),
651                              N_("select handling of tags that tag filtered objects"),
652                              parse_opt_tag_of_filtered_mode),
653                 OPT_STRING(0, "export-marks", &export_filename, N_("file"),
654                              N_("Dump marks to this file")),
655                 OPT_STRING(0, "import-marks", &import_filename, N_("file"),
656                              N_("Import marks from this file")),
657                 OPT_BOOLEAN(0, "fake-missing-tagger", &fake_missing_tagger,
658                              N_("Fake a tagger when tags lack one")),
659                 OPT_BOOLEAN(0, "full-tree", &full_tree,
660                              N_("Output full tree for each commit")),
661                 OPT_BOOLEAN(0, "use-done-feature", &use_done_feature,
662                              N_("Use the done feature to terminate the stream")),
663                 OPT_BOOL(0, "no-data", &no_data, N_("Skip output of blob data")),
664                 OPT_END()
665         };
666
667         if (argc == 1)
668                 usage_with_options (fast_export_usage, options);
669
670         /* we handle encodings */
671         git_config(git_default_config, NULL);
672
673         init_revisions(&revs, prefix);
674         revs.topo_order = 1;
675         revs.show_source = 1;
676         revs.rewrite_parents = 1;
677         argc = setup_revisions(argc, argv, &revs, NULL);
678         argc = parse_options(argc, argv, prefix, options, fast_export_usage, 0);
679         if (argc > 1)
680                 usage_with_options (fast_export_usage, options);
681
682         if (use_done_feature)
683                 printf("feature done\n");
684
685         if (import_filename)
686                 import_marks(import_filename);
687
688         if (import_filename && revs.prune_data.nr)
689                 full_tree = 1;
690
691         get_tags_and_duplicates(&revs.cmdline, &extra_refs);
692
693         if (prepare_revision_walk(&revs))
694                 die("revision walk setup failed");
695         revs.diffopt.format_callback = show_filemodify;
696         DIFF_OPT_SET(&revs.diffopt, RECURSIVE);
697         while ((commit = get_revision(&revs))) {
698                 if (has_unshown_parent(commit)) {
699                         add_object_array(&commit->object, NULL, &commits);
700                 }
701                 else {
702                         handle_commit(commit, &revs);
703                         handle_tail(&commits, &revs);
704                 }
705         }
706
707         handle_tags_and_duplicates(&extra_refs);
708
709         if (export_filename)
710                 export_marks(export_filename);
711
712         if (use_done_feature)
713                 printf("done\n");
714
715         return 0;
716 }