Merge branch 'ta/t1308-typofix'
[git.git] / fast-import.c
blob9503d087b28738eb7797f931e5edb0cd03d4b08f
1 #include "builtin.h"
2 #include "cache.h"
3 #include "repository.h"
4 #include "config.h"
5 #include "lockfile.h"
6 #include "object.h"
7 #include "blob.h"
8 #include "tree.h"
9 #include "commit.h"
10 #include "delta.h"
11 #include "pack.h"
12 #include "refs.h"
13 #include "csum-file.h"
14 #include "quote.h"
15 #include "dir.h"
16 #include "run-command.h"
17 #include "packfile.h"
18 #include "object-store.h"
19 #include "mem-pool.h"
20 #include "commit-reach.h"
22 #define PACK_ID_BITS 16
23 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
24 #define DEPTH_BITS 13
25 #define MAX_DEPTH ((1<<DEPTH_BITS)-1)
28 * We abuse the setuid bit on directories to mean "do not delta".
30 #define NO_DELTA S_ISUID
33 * The amount of additional space required in order to write an object into the
34 * current pack. This is the hash lengths at the end of the pack, plus the
35 * length of one object ID.
37 #define PACK_SIZE_THRESHOLD (the_hash_algo->rawsz * 3)
39 struct object_entry {
40 struct pack_idx_entry idx;
41 struct object_entry *next;
42 uint32_t type : TYPE_BITS,
43 pack_id : PACK_ID_BITS,
44 depth : DEPTH_BITS;
47 struct object_entry_pool {
48 struct object_entry_pool *next_pool;
49 struct object_entry *next_free;
50 struct object_entry *end;
51 struct object_entry entries[FLEX_ARRAY]; /* more */
54 struct mark_set {
55 union {
56 struct object_entry *marked[1024];
57 struct mark_set *sets[1024];
58 } data;
59 unsigned int shift;
62 struct last_object {
63 struct strbuf data;
64 off_t offset;
65 unsigned int depth;
66 unsigned no_swap : 1;
69 struct atom_str {
70 struct atom_str *next_atom;
71 unsigned short str_len;
72 char str_dat[FLEX_ARRAY]; /* more */
75 struct tree_content;
76 struct tree_entry {
77 struct tree_content *tree;
78 struct atom_str *name;
79 struct tree_entry_ms {
80 uint16_t mode;
81 struct object_id oid;
82 } versions[2];
85 struct tree_content {
86 unsigned int entry_capacity; /* must match avail_tree_content */
87 unsigned int entry_count;
88 unsigned int delta_depth;
89 struct tree_entry *entries[FLEX_ARRAY]; /* more */
92 struct avail_tree_content {
93 unsigned int entry_capacity; /* must match tree_content */
94 struct avail_tree_content *next_avail;
97 struct branch {
98 struct branch *table_next_branch;
99 struct branch *active_next_branch;
100 const char *name;
101 struct tree_entry branch_tree;
102 uintmax_t last_commit;
103 uintmax_t num_notes;
104 unsigned active : 1;
105 unsigned delete : 1;
106 unsigned pack_id : PACK_ID_BITS;
107 struct object_id oid;
110 struct tag {
111 struct tag *next_tag;
112 const char *name;
113 unsigned int pack_id;
114 struct object_id oid;
117 struct hash_list {
118 struct hash_list *next;
119 struct object_id oid;
122 typedef enum {
123 WHENSPEC_RAW = 1,
124 WHENSPEC_RFC2822,
125 WHENSPEC_NOW
126 } whenspec_type;
128 struct recent_command {
129 struct recent_command *prev;
130 struct recent_command *next;
131 char *buf;
134 /* Configured limits on output */
135 static unsigned long max_depth = 50;
136 static off_t max_packsize;
137 static int unpack_limit = 100;
138 static int force_update;
140 /* Stats and misc. counters */
141 static uintmax_t alloc_count;
142 static uintmax_t marks_set_count;
143 static uintmax_t object_count_by_type[1 << TYPE_BITS];
144 static uintmax_t duplicate_count_by_type[1 << TYPE_BITS];
145 static uintmax_t delta_count_by_type[1 << TYPE_BITS];
146 static uintmax_t delta_count_attempts_by_type[1 << TYPE_BITS];
147 static unsigned long object_count;
148 static unsigned long branch_count;
149 static unsigned long branch_load_count;
150 static int failure;
151 static FILE *pack_edges;
152 static unsigned int show_stats = 1;
153 static int global_argc;
154 static const char **global_argv;
156 /* Memory pools */
157 static struct mem_pool fi_mem_pool = {NULL, 2*1024*1024 -
158 sizeof(struct mp_block), 0 };
160 /* Atom management */
161 static unsigned int atom_table_sz = 4451;
162 static unsigned int atom_cnt;
163 static struct atom_str **atom_table;
165 /* The .pack file being generated */
166 static struct pack_idx_option pack_idx_opts;
167 static unsigned int pack_id;
168 static struct hashfile *pack_file;
169 static struct packed_git *pack_data;
170 static struct packed_git **all_packs;
171 static off_t pack_size;
173 /* Table of objects we've written. */
174 static unsigned int object_entry_alloc = 5000;
175 static struct object_entry_pool *blocks;
176 static struct object_entry *object_table[1 << 16];
177 static struct mark_set *marks;
178 static const char *export_marks_file;
179 static const char *import_marks_file;
180 static int import_marks_file_from_stream;
181 static int import_marks_file_ignore_missing;
182 static int import_marks_file_done;
183 static int relative_marks_paths;
185 /* Our last blob */
186 static struct last_object last_blob = { STRBUF_INIT, 0, 0, 0 };
188 /* Tree management */
189 static unsigned int tree_entry_alloc = 1000;
190 static void *avail_tree_entry;
191 static unsigned int avail_tree_table_sz = 100;
192 static struct avail_tree_content **avail_tree_table;
193 static size_t tree_entry_allocd;
194 static struct strbuf old_tree = STRBUF_INIT;
195 static struct strbuf new_tree = STRBUF_INIT;
197 /* Branch data */
198 static unsigned long max_active_branches = 5;
199 static unsigned long cur_active_branches;
200 static unsigned long branch_table_sz = 1039;
201 static struct branch **branch_table;
202 static struct branch *active_branches;
204 /* Tag data */
205 static struct tag *first_tag;
206 static struct tag *last_tag;
208 /* Input stream parsing */
209 static whenspec_type whenspec = WHENSPEC_RAW;
210 static struct strbuf command_buf = STRBUF_INIT;
211 static int unread_command_buf;
212 static struct recent_command cmd_hist = {&cmd_hist, &cmd_hist, NULL};
213 static struct recent_command *cmd_tail = &cmd_hist;
214 static struct recent_command *rc_free;
215 static unsigned int cmd_save = 100;
216 static uintmax_t next_mark;
217 static struct strbuf new_data = STRBUF_INIT;
218 static int seen_data_command;
219 static int require_explicit_termination;
221 /* Signal handling */
222 static volatile sig_atomic_t checkpoint_requested;
224 /* Where to write output of cat-blob commands */
225 static int cat_blob_fd = STDOUT_FILENO;
227 static void parse_argv(void);
228 static void parse_get_mark(const char *p);
229 static void parse_cat_blob(const char *p);
230 static void parse_ls(const char *p, struct branch *b);
232 static void write_branch_report(FILE *rpt, struct branch *b)
234 fprintf(rpt, "%s:\n", b->name);
236 fprintf(rpt, " status :");
237 if (b->active)
238 fputs(" active", rpt);
239 if (b->branch_tree.tree)
240 fputs(" loaded", rpt);
241 if (is_null_oid(&b->branch_tree.versions[1].oid))
242 fputs(" dirty", rpt);
243 fputc('\n', rpt);
245 fprintf(rpt, " tip commit : %s\n", oid_to_hex(&b->oid));
246 fprintf(rpt, " old tree : %s\n",
247 oid_to_hex(&b->branch_tree.versions[0].oid));
248 fprintf(rpt, " cur tree : %s\n",
249 oid_to_hex(&b->branch_tree.versions[1].oid));
250 fprintf(rpt, " commit clock: %" PRIuMAX "\n", b->last_commit);
252 fputs(" last pack : ", rpt);
253 if (b->pack_id < MAX_PACK_ID)
254 fprintf(rpt, "%u", b->pack_id);
255 fputc('\n', rpt);
257 fputc('\n', rpt);
260 static void dump_marks_helper(FILE *, uintmax_t, struct mark_set *);
262 static void write_crash_report(const char *err)
264 char *loc = git_pathdup("fast_import_crash_%"PRIuMAX, (uintmax_t) getpid());
265 FILE *rpt = fopen(loc, "w");
266 struct branch *b;
267 unsigned long lu;
268 struct recent_command *rc;
270 if (!rpt) {
271 error_errno("can't write crash report %s", loc);
272 free(loc);
273 return;
276 fprintf(stderr, "fast-import: dumping crash report to %s\n", loc);
278 fprintf(rpt, "fast-import crash report:\n");
279 fprintf(rpt, " fast-import process: %"PRIuMAX"\n", (uintmax_t) getpid());
280 fprintf(rpt, " parent process : %"PRIuMAX"\n", (uintmax_t) getppid());
281 fprintf(rpt, " at %s\n", show_date(time(NULL), 0, DATE_MODE(ISO8601)));
282 fputc('\n', rpt);
284 fputs("fatal: ", rpt);
285 fputs(err, rpt);
286 fputc('\n', rpt);
288 fputc('\n', rpt);
289 fputs("Most Recent Commands Before Crash\n", rpt);
290 fputs("---------------------------------\n", rpt);
291 for (rc = cmd_hist.next; rc != &cmd_hist; rc = rc->next) {
292 if (rc->next == &cmd_hist)
293 fputs("* ", rpt);
294 else
295 fputs(" ", rpt);
296 fputs(rc->buf, rpt);
297 fputc('\n', rpt);
300 fputc('\n', rpt);
301 fputs("Active Branch LRU\n", rpt);
302 fputs("-----------------\n", rpt);
303 fprintf(rpt, " active_branches = %lu cur, %lu max\n",
304 cur_active_branches,
305 max_active_branches);
306 fputc('\n', rpt);
307 fputs(" pos clock name\n", rpt);
308 fputs(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", rpt);
309 for (b = active_branches, lu = 0; b; b = b->active_next_branch)
310 fprintf(rpt, " %2lu) %6" PRIuMAX" %s\n",
311 ++lu, b->last_commit, b->name);
313 fputc('\n', rpt);
314 fputs("Inactive Branches\n", rpt);
315 fputs("-----------------\n", rpt);
316 for (lu = 0; lu < branch_table_sz; lu++) {
317 for (b = branch_table[lu]; b; b = b->table_next_branch)
318 write_branch_report(rpt, b);
321 if (first_tag) {
322 struct tag *tg;
323 fputc('\n', rpt);
324 fputs("Annotated Tags\n", rpt);
325 fputs("--------------\n", rpt);
326 for (tg = first_tag; tg; tg = tg->next_tag) {
327 fputs(oid_to_hex(&tg->oid), rpt);
328 fputc(' ', rpt);
329 fputs(tg->name, rpt);
330 fputc('\n', rpt);
334 fputc('\n', rpt);
335 fputs("Marks\n", rpt);
336 fputs("-----\n", rpt);
337 if (export_marks_file)
338 fprintf(rpt, " exported to %s\n", export_marks_file);
339 else
340 dump_marks_helper(rpt, 0, marks);
342 fputc('\n', rpt);
343 fputs("-------------------\n", rpt);
344 fputs("END OF CRASH REPORT\n", rpt);
345 fclose(rpt);
346 free(loc);
349 static void end_packfile(void);
350 static void unkeep_all_packs(void);
351 static void dump_marks(void);
353 static NORETURN void die_nicely(const char *err, va_list params)
355 static int zombie;
356 char message[2 * PATH_MAX];
358 vsnprintf(message, sizeof(message), err, params);
359 fputs("fatal: ", stderr);
360 fputs(message, stderr);
361 fputc('\n', stderr);
363 if (!zombie) {
364 zombie = 1;
365 write_crash_report(message);
366 end_packfile();
367 unkeep_all_packs();
368 dump_marks();
370 exit(128);
373 #ifndef SIGUSR1 /* Windows, for example */
375 static void set_checkpoint_signal(void)
379 #else
381 static void checkpoint_signal(int signo)
383 checkpoint_requested = 1;
386 static void set_checkpoint_signal(void)
388 struct sigaction sa;
390 memset(&sa, 0, sizeof(sa));
391 sa.sa_handler = checkpoint_signal;
392 sigemptyset(&sa.sa_mask);
393 sa.sa_flags = SA_RESTART;
394 sigaction(SIGUSR1, &sa, NULL);
397 #endif
399 static void alloc_objects(unsigned int cnt)
401 struct object_entry_pool *b;
403 b = xmalloc(sizeof(struct object_entry_pool)
404 + cnt * sizeof(struct object_entry));
405 b->next_pool = blocks;
406 b->next_free = b->entries;
407 b->end = b->entries + cnt;
408 blocks = b;
409 alloc_count += cnt;
412 static struct object_entry *new_object(struct object_id *oid)
414 struct object_entry *e;
416 if (blocks->next_free == blocks->end)
417 alloc_objects(object_entry_alloc);
419 e = blocks->next_free++;
420 oidcpy(&e->idx.oid, oid);
421 return e;
424 static struct object_entry *find_object(struct object_id *oid)
426 unsigned int h = oid->hash[0] << 8 | oid->hash[1];
427 struct object_entry *e;
428 for (e = object_table[h]; e; e = e->next)
429 if (oideq(oid, &e->idx.oid))
430 return e;
431 return NULL;
434 static struct object_entry *insert_object(struct object_id *oid)
436 unsigned int h = oid->hash[0] << 8 | oid->hash[1];
437 struct object_entry *e = object_table[h];
439 while (e) {
440 if (oideq(oid, &e->idx.oid))
441 return e;
442 e = e->next;
445 e = new_object(oid);
446 e->next = object_table[h];
447 e->idx.offset = 0;
448 object_table[h] = e;
449 return e;
452 static void invalidate_pack_id(unsigned int id)
454 unsigned int h;
455 unsigned long lu;
456 struct tag *t;
458 for (h = 0; h < ARRAY_SIZE(object_table); h++) {
459 struct object_entry *e;
461 for (e = object_table[h]; e; e = e->next)
462 if (e->pack_id == id)
463 e->pack_id = MAX_PACK_ID;
466 for (lu = 0; lu < branch_table_sz; lu++) {
467 struct branch *b;
469 for (b = branch_table[lu]; b; b = b->table_next_branch)
470 if (b->pack_id == id)
471 b->pack_id = MAX_PACK_ID;
474 for (t = first_tag; t; t = t->next_tag)
475 if (t->pack_id == id)
476 t->pack_id = MAX_PACK_ID;
479 static unsigned int hc_str(const char *s, size_t len)
481 unsigned int r = 0;
482 while (len-- > 0)
483 r = r * 31 + *s++;
484 return r;
487 static char *pool_strdup(const char *s)
489 size_t len = strlen(s) + 1;
490 char *r = mem_pool_alloc(&fi_mem_pool, len);
491 memcpy(r, s, len);
492 return r;
495 static void insert_mark(uintmax_t idnum, struct object_entry *oe)
497 struct mark_set *s = marks;
498 while ((idnum >> s->shift) >= 1024) {
499 s = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct mark_set));
500 s->shift = marks->shift + 10;
501 s->data.sets[0] = marks;
502 marks = s;
504 while (s->shift) {
505 uintmax_t i = idnum >> s->shift;
506 idnum -= i << s->shift;
507 if (!s->data.sets[i]) {
508 s->data.sets[i] = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct mark_set));
509 s->data.sets[i]->shift = s->shift - 10;
511 s = s->data.sets[i];
513 if (!s->data.marked[idnum])
514 marks_set_count++;
515 s->data.marked[idnum] = oe;
518 static struct object_entry *find_mark(uintmax_t idnum)
520 uintmax_t orig_idnum = idnum;
521 struct mark_set *s = marks;
522 struct object_entry *oe = NULL;
523 if ((idnum >> s->shift) < 1024) {
524 while (s && s->shift) {
525 uintmax_t i = idnum >> s->shift;
526 idnum -= i << s->shift;
527 s = s->data.sets[i];
529 if (s)
530 oe = s->data.marked[idnum];
532 if (!oe)
533 die("mark :%" PRIuMAX " not declared", orig_idnum);
534 return oe;
537 static struct atom_str *to_atom(const char *s, unsigned short len)
539 unsigned int hc = hc_str(s, len) % atom_table_sz;
540 struct atom_str *c;
542 for (c = atom_table[hc]; c; c = c->next_atom)
543 if (c->str_len == len && !strncmp(s, c->str_dat, len))
544 return c;
546 c = mem_pool_alloc(&fi_mem_pool, sizeof(struct atom_str) + len + 1);
547 c->str_len = len;
548 memcpy(c->str_dat, s, len);
549 c->str_dat[len] = 0;
550 c->next_atom = atom_table[hc];
551 atom_table[hc] = c;
552 atom_cnt++;
553 return c;
556 static struct branch *lookup_branch(const char *name)
558 unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
559 struct branch *b;
561 for (b = branch_table[hc]; b; b = b->table_next_branch)
562 if (!strcmp(name, b->name))
563 return b;
564 return NULL;
567 static struct branch *new_branch(const char *name)
569 unsigned int hc = hc_str(name, strlen(name)) % branch_table_sz;
570 struct branch *b = lookup_branch(name);
572 if (b)
573 die("Invalid attempt to create duplicate branch: %s", name);
574 if (check_refname_format(name, REFNAME_ALLOW_ONELEVEL))
575 die("Branch name doesn't conform to GIT standards: %s", name);
577 b = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct branch));
578 b->name = pool_strdup(name);
579 b->table_next_branch = branch_table[hc];
580 b->branch_tree.versions[0].mode = S_IFDIR;
581 b->branch_tree.versions[1].mode = S_IFDIR;
582 b->num_notes = 0;
583 b->active = 0;
584 b->pack_id = MAX_PACK_ID;
585 branch_table[hc] = b;
586 branch_count++;
587 return b;
590 static unsigned int hc_entries(unsigned int cnt)
592 cnt = cnt & 7 ? (cnt / 8) + 1 : cnt / 8;
593 return cnt < avail_tree_table_sz ? cnt : avail_tree_table_sz - 1;
596 static struct tree_content *new_tree_content(unsigned int cnt)
598 struct avail_tree_content *f, *l = NULL;
599 struct tree_content *t;
600 unsigned int hc = hc_entries(cnt);
602 for (f = avail_tree_table[hc]; f; l = f, f = f->next_avail)
603 if (f->entry_capacity >= cnt)
604 break;
606 if (f) {
607 if (l)
608 l->next_avail = f->next_avail;
609 else
610 avail_tree_table[hc] = f->next_avail;
611 } else {
612 cnt = cnt & 7 ? ((cnt / 8) + 1) * 8 : cnt;
613 f = mem_pool_alloc(&fi_mem_pool, sizeof(*t) + sizeof(t->entries[0]) * cnt);
614 f->entry_capacity = cnt;
617 t = (struct tree_content*)f;
618 t->entry_count = 0;
619 t->delta_depth = 0;
620 return t;
623 static void release_tree_entry(struct tree_entry *e);
624 static void release_tree_content(struct tree_content *t)
626 struct avail_tree_content *f = (struct avail_tree_content*)t;
627 unsigned int hc = hc_entries(f->entry_capacity);
628 f->next_avail = avail_tree_table[hc];
629 avail_tree_table[hc] = f;
632 static void release_tree_content_recursive(struct tree_content *t)
634 unsigned int i;
635 for (i = 0; i < t->entry_count; i++)
636 release_tree_entry(t->entries[i]);
637 release_tree_content(t);
640 static struct tree_content *grow_tree_content(
641 struct tree_content *t,
642 int amt)
644 struct tree_content *r = new_tree_content(t->entry_count + amt);
645 r->entry_count = t->entry_count;
646 r->delta_depth = t->delta_depth;
647 COPY_ARRAY(r->entries, t->entries, t->entry_count);
648 release_tree_content(t);
649 return r;
652 static struct tree_entry *new_tree_entry(void)
654 struct tree_entry *e;
656 if (!avail_tree_entry) {
657 unsigned int n = tree_entry_alloc;
658 tree_entry_allocd += n * sizeof(struct tree_entry);
659 ALLOC_ARRAY(e, n);
660 avail_tree_entry = e;
661 while (n-- > 1) {
662 *((void**)e) = e + 1;
663 e++;
665 *((void**)e) = NULL;
668 e = avail_tree_entry;
669 avail_tree_entry = *((void**)e);
670 return e;
673 static void release_tree_entry(struct tree_entry *e)
675 if (e->tree)
676 release_tree_content_recursive(e->tree);
677 *((void**)e) = avail_tree_entry;
678 avail_tree_entry = e;
681 static struct tree_content *dup_tree_content(struct tree_content *s)
683 struct tree_content *d;
684 struct tree_entry *a, *b;
685 unsigned int i;
687 if (!s)
688 return NULL;
689 d = new_tree_content(s->entry_count);
690 for (i = 0; i < s->entry_count; i++) {
691 a = s->entries[i];
692 b = new_tree_entry();
693 memcpy(b, a, sizeof(*a));
694 if (a->tree && is_null_oid(&b->versions[1].oid))
695 b->tree = dup_tree_content(a->tree);
696 else
697 b->tree = NULL;
698 d->entries[i] = b;
700 d->entry_count = s->entry_count;
701 d->delta_depth = s->delta_depth;
703 return d;
706 static void start_packfile(void)
708 struct strbuf tmp_file = STRBUF_INIT;
709 struct packed_git *p;
710 struct pack_header hdr;
711 int pack_fd;
713 pack_fd = odb_mkstemp(&tmp_file, "pack/tmp_pack_XXXXXX");
714 FLEX_ALLOC_STR(p, pack_name, tmp_file.buf);
715 strbuf_release(&tmp_file);
717 p->pack_fd = pack_fd;
718 p->do_not_close = 1;
719 pack_file = hashfd(pack_fd, p->pack_name);
721 hdr.hdr_signature = htonl(PACK_SIGNATURE);
722 hdr.hdr_version = htonl(2);
723 hdr.hdr_entries = 0;
724 hashwrite(pack_file, &hdr, sizeof(hdr));
726 pack_data = p;
727 pack_size = sizeof(hdr);
728 object_count = 0;
730 REALLOC_ARRAY(all_packs, pack_id + 1);
731 all_packs[pack_id] = p;
734 static const char *create_index(void)
736 const char *tmpfile;
737 struct pack_idx_entry **idx, **c, **last;
738 struct object_entry *e;
739 struct object_entry_pool *o;
741 /* Build the table of object IDs. */
742 ALLOC_ARRAY(idx, object_count);
743 c = idx;
744 for (o = blocks; o; o = o->next_pool)
745 for (e = o->next_free; e-- != o->entries;)
746 if (pack_id == e->pack_id)
747 *c++ = &e->idx;
748 last = idx + object_count;
749 if (c != last)
750 die("internal consistency error creating the index");
752 tmpfile = write_idx_file(NULL, idx, object_count, &pack_idx_opts,
753 pack_data->hash);
754 free(idx);
755 return tmpfile;
758 static char *keep_pack(const char *curr_index_name)
760 static const char *keep_msg = "fast-import";
761 struct strbuf name = STRBUF_INIT;
762 int keep_fd;
764 odb_pack_name(&name, pack_data->hash, "keep");
765 keep_fd = odb_pack_keep(name.buf);
766 if (keep_fd < 0)
767 die_errno("cannot create keep file");
768 write_or_die(keep_fd, keep_msg, strlen(keep_msg));
769 if (close(keep_fd))
770 die_errno("failed to write keep file");
772 odb_pack_name(&name, pack_data->hash, "pack");
773 if (finalize_object_file(pack_data->pack_name, name.buf))
774 die("cannot store pack file");
776 odb_pack_name(&name, pack_data->hash, "idx");
777 if (finalize_object_file(curr_index_name, name.buf))
778 die("cannot store index file");
779 free((void *)curr_index_name);
780 return strbuf_detach(&name, NULL);
783 static void unkeep_all_packs(void)
785 struct strbuf name = STRBUF_INIT;
786 int k;
788 for (k = 0; k < pack_id; k++) {
789 struct packed_git *p = all_packs[k];
790 odb_pack_name(&name, p->hash, "keep");
791 unlink_or_warn(name.buf);
793 strbuf_release(&name);
796 static int loosen_small_pack(const struct packed_git *p)
798 struct child_process unpack = CHILD_PROCESS_INIT;
800 if (lseek(p->pack_fd, 0, SEEK_SET) < 0)
801 die_errno("Failed seeking to start of '%s'", p->pack_name);
803 unpack.in = p->pack_fd;
804 unpack.git_cmd = 1;
805 unpack.stdout_to_stderr = 1;
806 argv_array_push(&unpack.args, "unpack-objects");
807 if (!show_stats)
808 argv_array_push(&unpack.args, "-q");
810 return run_command(&unpack);
813 static void end_packfile(void)
815 static int running;
817 if (running || !pack_data)
818 return;
820 running = 1;
821 clear_delta_base_cache();
822 if (object_count) {
823 struct packed_git *new_p;
824 struct object_id cur_pack_oid;
825 char *idx_name;
826 int i;
827 struct branch *b;
828 struct tag *t;
830 close_pack_windows(pack_data);
831 finalize_hashfile(pack_file, cur_pack_oid.hash, 0);
832 fixup_pack_header_footer(pack_data->pack_fd, pack_data->hash,
833 pack_data->pack_name, object_count,
834 cur_pack_oid.hash, pack_size);
836 if (object_count <= unpack_limit) {
837 if (!loosen_small_pack(pack_data)) {
838 invalidate_pack_id(pack_id);
839 goto discard_pack;
843 close(pack_data->pack_fd);
844 idx_name = keep_pack(create_index());
846 /* Register the packfile with core git's machinery. */
847 new_p = add_packed_git(idx_name, strlen(idx_name), 1);
848 if (!new_p)
849 die("core git rejected index %s", idx_name);
850 all_packs[pack_id] = new_p;
851 install_packed_git(the_repository, new_p);
852 free(idx_name);
854 /* Print the boundary */
855 if (pack_edges) {
856 fprintf(pack_edges, "%s:", new_p->pack_name);
857 for (i = 0; i < branch_table_sz; i++) {
858 for (b = branch_table[i]; b; b = b->table_next_branch) {
859 if (b->pack_id == pack_id)
860 fprintf(pack_edges, " %s",
861 oid_to_hex(&b->oid));
864 for (t = first_tag; t; t = t->next_tag) {
865 if (t->pack_id == pack_id)
866 fprintf(pack_edges, " %s",
867 oid_to_hex(&t->oid));
869 fputc('\n', pack_edges);
870 fflush(pack_edges);
873 pack_id++;
875 else {
876 discard_pack:
877 close(pack_data->pack_fd);
878 unlink_or_warn(pack_data->pack_name);
880 FREE_AND_NULL(pack_data);
881 running = 0;
883 /* We can't carry a delta across packfiles. */
884 strbuf_release(&last_blob.data);
885 last_blob.offset = 0;
886 last_blob.depth = 0;
889 static void cycle_packfile(void)
891 end_packfile();
892 start_packfile();
895 static int store_object(
896 enum object_type type,
897 struct strbuf *dat,
898 struct last_object *last,
899 struct object_id *oidout,
900 uintmax_t mark)
902 void *out, *delta;
903 struct object_entry *e;
904 unsigned char hdr[96];
905 struct object_id oid;
906 unsigned long hdrlen, deltalen;
907 git_hash_ctx c;
908 git_zstream s;
910 hdrlen = xsnprintf((char *)hdr, sizeof(hdr), "%s %lu",
911 type_name(type), (unsigned long)dat->len) + 1;
912 the_hash_algo->init_fn(&c);
913 the_hash_algo->update_fn(&c, hdr, hdrlen);
914 the_hash_algo->update_fn(&c, dat->buf, dat->len);
915 the_hash_algo->final_fn(oid.hash, &c);
916 if (oidout)
917 oidcpy(oidout, &oid);
919 e = insert_object(&oid);
920 if (mark)
921 insert_mark(mark, e);
922 if (e->idx.offset) {
923 duplicate_count_by_type[type]++;
924 return 1;
925 } else if (find_sha1_pack(oid.hash,
926 get_all_packs(the_repository))) {
927 e->type = type;
928 e->pack_id = MAX_PACK_ID;
929 e->idx.offset = 1; /* just not zero! */
930 duplicate_count_by_type[type]++;
931 return 1;
934 if (last && last->data.len && last->data.buf && last->depth < max_depth
935 && dat->len > the_hash_algo->rawsz) {
937 delta_count_attempts_by_type[type]++;
938 delta = diff_delta(last->data.buf, last->data.len,
939 dat->buf, dat->len,
940 &deltalen, dat->len - the_hash_algo->rawsz);
941 } else
942 delta = NULL;
944 git_deflate_init(&s, pack_compression_level);
945 if (delta) {
946 s.next_in = delta;
947 s.avail_in = deltalen;
948 } else {
949 s.next_in = (void *)dat->buf;
950 s.avail_in = dat->len;
952 s.avail_out = git_deflate_bound(&s, s.avail_in);
953 s.next_out = out = xmalloc(s.avail_out);
954 while (git_deflate(&s, Z_FINISH) == Z_OK)
955 ; /* nothing */
956 git_deflate_end(&s);
958 /* Determine if we should auto-checkpoint. */
959 if ((max_packsize
960 && (pack_size + PACK_SIZE_THRESHOLD + s.total_out) > max_packsize)
961 || (pack_size + PACK_SIZE_THRESHOLD + s.total_out) < pack_size) {
963 /* This new object needs to *not* have the current pack_id. */
964 e->pack_id = pack_id + 1;
965 cycle_packfile();
967 /* We cannot carry a delta into the new pack. */
968 if (delta) {
969 FREE_AND_NULL(delta);
971 git_deflate_init(&s, pack_compression_level);
972 s.next_in = (void *)dat->buf;
973 s.avail_in = dat->len;
974 s.avail_out = git_deflate_bound(&s, s.avail_in);
975 s.next_out = out = xrealloc(out, s.avail_out);
976 while (git_deflate(&s, Z_FINISH) == Z_OK)
977 ; /* nothing */
978 git_deflate_end(&s);
982 e->type = type;
983 e->pack_id = pack_id;
984 e->idx.offset = pack_size;
985 object_count++;
986 object_count_by_type[type]++;
988 crc32_begin(pack_file);
990 if (delta) {
991 off_t ofs = e->idx.offset - last->offset;
992 unsigned pos = sizeof(hdr) - 1;
994 delta_count_by_type[type]++;
995 e->depth = last->depth + 1;
997 hdrlen = encode_in_pack_object_header(hdr, sizeof(hdr),
998 OBJ_OFS_DELTA, deltalen);
999 hashwrite(pack_file, hdr, hdrlen);
1000 pack_size += hdrlen;
1002 hdr[pos] = ofs & 127;
1003 while (ofs >>= 7)
1004 hdr[--pos] = 128 | (--ofs & 127);
1005 hashwrite(pack_file, hdr + pos, sizeof(hdr) - pos);
1006 pack_size += sizeof(hdr) - pos;
1007 } else {
1008 e->depth = 0;
1009 hdrlen = encode_in_pack_object_header(hdr, sizeof(hdr),
1010 type, dat->len);
1011 hashwrite(pack_file, hdr, hdrlen);
1012 pack_size += hdrlen;
1015 hashwrite(pack_file, out, s.total_out);
1016 pack_size += s.total_out;
1018 e->idx.crc32 = crc32_end(pack_file);
1020 free(out);
1021 free(delta);
1022 if (last) {
1023 if (last->no_swap) {
1024 last->data = *dat;
1025 } else {
1026 strbuf_swap(&last->data, dat);
1028 last->offset = e->idx.offset;
1029 last->depth = e->depth;
1031 return 0;
1034 static void truncate_pack(struct hashfile_checkpoint *checkpoint)
1036 if (hashfile_truncate(pack_file, checkpoint))
1037 die_errno("cannot truncate pack to skip duplicate");
1038 pack_size = checkpoint->offset;
1041 static void stream_blob(uintmax_t len, struct object_id *oidout, uintmax_t mark)
1043 size_t in_sz = 64 * 1024, out_sz = 64 * 1024;
1044 unsigned char *in_buf = xmalloc(in_sz);
1045 unsigned char *out_buf = xmalloc(out_sz);
1046 struct object_entry *e;
1047 struct object_id oid;
1048 unsigned long hdrlen;
1049 off_t offset;
1050 git_hash_ctx c;
1051 git_zstream s;
1052 struct hashfile_checkpoint checkpoint;
1053 int status = Z_OK;
1055 /* Determine if we should auto-checkpoint. */
1056 if ((max_packsize
1057 && (pack_size + PACK_SIZE_THRESHOLD + len) > max_packsize)
1058 || (pack_size + PACK_SIZE_THRESHOLD + len) < pack_size)
1059 cycle_packfile();
1061 hashfile_checkpoint(pack_file, &checkpoint);
1062 offset = checkpoint.offset;
1064 hdrlen = xsnprintf((char *)out_buf, out_sz, "blob %" PRIuMAX, len) + 1;
1066 the_hash_algo->init_fn(&c);
1067 the_hash_algo->update_fn(&c, out_buf, hdrlen);
1069 crc32_begin(pack_file);
1071 git_deflate_init(&s, pack_compression_level);
1073 hdrlen = encode_in_pack_object_header(out_buf, out_sz, OBJ_BLOB, len);
1075 s.next_out = out_buf + hdrlen;
1076 s.avail_out = out_sz - hdrlen;
1078 while (status != Z_STREAM_END) {
1079 if (0 < len && !s.avail_in) {
1080 size_t cnt = in_sz < len ? in_sz : (size_t)len;
1081 size_t n = fread(in_buf, 1, cnt, stdin);
1082 if (!n && feof(stdin))
1083 die("EOF in data (%" PRIuMAX " bytes remaining)", len);
1085 the_hash_algo->update_fn(&c, in_buf, n);
1086 s.next_in = in_buf;
1087 s.avail_in = n;
1088 len -= n;
1091 status = git_deflate(&s, len ? 0 : Z_FINISH);
1093 if (!s.avail_out || status == Z_STREAM_END) {
1094 size_t n = s.next_out - out_buf;
1095 hashwrite(pack_file, out_buf, n);
1096 pack_size += n;
1097 s.next_out = out_buf;
1098 s.avail_out = out_sz;
1101 switch (status) {
1102 case Z_OK:
1103 case Z_BUF_ERROR:
1104 case Z_STREAM_END:
1105 continue;
1106 default:
1107 die("unexpected deflate failure: %d", status);
1110 git_deflate_end(&s);
1111 the_hash_algo->final_fn(oid.hash, &c);
1113 if (oidout)
1114 oidcpy(oidout, &oid);
1116 e = insert_object(&oid);
1118 if (mark)
1119 insert_mark(mark, e);
1121 if (e->idx.offset) {
1122 duplicate_count_by_type[OBJ_BLOB]++;
1123 truncate_pack(&checkpoint);
1125 } else if (find_sha1_pack(oid.hash,
1126 get_all_packs(the_repository))) {
1127 e->type = OBJ_BLOB;
1128 e->pack_id = MAX_PACK_ID;
1129 e->idx.offset = 1; /* just not zero! */
1130 duplicate_count_by_type[OBJ_BLOB]++;
1131 truncate_pack(&checkpoint);
1133 } else {
1134 e->depth = 0;
1135 e->type = OBJ_BLOB;
1136 e->pack_id = pack_id;
1137 e->idx.offset = offset;
1138 e->idx.crc32 = crc32_end(pack_file);
1139 object_count++;
1140 object_count_by_type[OBJ_BLOB]++;
1143 free(in_buf);
1144 free(out_buf);
1147 /* All calls must be guarded by find_object() or find_mark() to
1148 * ensure the 'struct object_entry' passed was written by this
1149 * process instance. We unpack the entry by the offset, avoiding
1150 * the need for the corresponding .idx file. This unpacking rule
1151 * works because we only use OBJ_REF_DELTA within the packfiles
1152 * created by fast-import.
1154 * oe must not be NULL. Such an oe usually comes from giving
1155 * an unknown SHA-1 to find_object() or an undefined mark to
1156 * find_mark(). Callers must test for this condition and use
1157 * the standard read_sha1_file() when it happens.
1159 * oe->pack_id must not be MAX_PACK_ID. Such an oe is usually from
1160 * find_mark(), where the mark was reloaded from an existing marks
1161 * file and is referencing an object that this fast-import process
1162 * instance did not write out to a packfile. Callers must test for
1163 * this condition and use read_sha1_file() instead.
1165 static void *gfi_unpack_entry(
1166 struct object_entry *oe,
1167 unsigned long *sizep)
1169 enum object_type type;
1170 struct packed_git *p = all_packs[oe->pack_id];
1171 if (p == pack_data && p->pack_size < (pack_size + the_hash_algo->rawsz)) {
1172 /* The object is stored in the packfile we are writing to
1173 * and we have modified it since the last time we scanned
1174 * back to read a previously written object. If an old
1175 * window covered [p->pack_size, p->pack_size + rawsz) its
1176 * data is stale and is not valid. Closing all windows
1177 * and updating the packfile length ensures we can read
1178 * the newly written data.
1180 close_pack_windows(p);
1181 hashflush(pack_file);
1183 /* We have to offer rawsz bytes additional on the end of
1184 * the packfile as the core unpacker code assumes the
1185 * footer is present at the file end and must promise
1186 * at least rawsz bytes within any window it maps. But
1187 * we don't actually create the footer here.
1189 p->pack_size = pack_size + the_hash_algo->rawsz;
1191 return unpack_entry(the_repository, p, oe->idx.offset, &type, sizep);
1194 static const char *get_mode(const char *str, uint16_t *modep)
1196 unsigned char c;
1197 uint16_t mode = 0;
1199 while ((c = *str++) != ' ') {
1200 if (c < '0' || c > '7')
1201 return NULL;
1202 mode = (mode << 3) + (c - '0');
1204 *modep = mode;
1205 return str;
1208 static void load_tree(struct tree_entry *root)
1210 struct object_id *oid = &root->versions[1].oid;
1211 struct object_entry *myoe;
1212 struct tree_content *t;
1213 unsigned long size;
1214 char *buf;
1215 const char *c;
1217 root->tree = t = new_tree_content(8);
1218 if (is_null_oid(oid))
1219 return;
1221 myoe = find_object(oid);
1222 if (myoe && myoe->pack_id != MAX_PACK_ID) {
1223 if (myoe->type != OBJ_TREE)
1224 die("Not a tree: %s", oid_to_hex(oid));
1225 t->delta_depth = myoe->depth;
1226 buf = gfi_unpack_entry(myoe, &size);
1227 if (!buf)
1228 die("Can't load tree %s", oid_to_hex(oid));
1229 } else {
1230 enum object_type type;
1231 buf = read_object_file(oid, &type, &size);
1232 if (!buf || type != OBJ_TREE)
1233 die("Can't load tree %s", oid_to_hex(oid));
1236 c = buf;
1237 while (c != (buf + size)) {
1238 struct tree_entry *e = new_tree_entry();
1240 if (t->entry_count == t->entry_capacity)
1241 root->tree = t = grow_tree_content(t, t->entry_count);
1242 t->entries[t->entry_count++] = e;
1244 e->tree = NULL;
1245 c = get_mode(c, &e->versions[1].mode);
1246 if (!c)
1247 die("Corrupt mode in %s", oid_to_hex(oid));
1248 e->versions[0].mode = e->versions[1].mode;
1249 e->name = to_atom(c, strlen(c));
1250 c += e->name->str_len + 1;
1251 hashcpy(e->versions[0].oid.hash, (unsigned char *)c);
1252 hashcpy(e->versions[1].oid.hash, (unsigned char *)c);
1253 c += the_hash_algo->rawsz;
1255 free(buf);
1258 static int tecmp0 (const void *_a, const void *_b)
1260 struct tree_entry *a = *((struct tree_entry**)_a);
1261 struct tree_entry *b = *((struct tree_entry**)_b);
1262 return base_name_compare(
1263 a->name->str_dat, a->name->str_len, a->versions[0].mode,
1264 b->name->str_dat, b->name->str_len, b->versions[0].mode);
1267 static int tecmp1 (const void *_a, const void *_b)
1269 struct tree_entry *a = *((struct tree_entry**)_a);
1270 struct tree_entry *b = *((struct tree_entry**)_b);
1271 return base_name_compare(
1272 a->name->str_dat, a->name->str_len, a->versions[1].mode,
1273 b->name->str_dat, b->name->str_len, b->versions[1].mode);
1276 static void mktree(struct tree_content *t, int v, struct strbuf *b)
1278 size_t maxlen = 0;
1279 unsigned int i;
1281 if (!v)
1282 QSORT(t->entries, t->entry_count, tecmp0);
1283 else
1284 QSORT(t->entries, t->entry_count, tecmp1);
1286 for (i = 0; i < t->entry_count; i++) {
1287 if (t->entries[i]->versions[v].mode)
1288 maxlen += t->entries[i]->name->str_len + 34;
1291 strbuf_reset(b);
1292 strbuf_grow(b, maxlen);
1293 for (i = 0; i < t->entry_count; i++) {
1294 struct tree_entry *e = t->entries[i];
1295 if (!e->versions[v].mode)
1296 continue;
1297 strbuf_addf(b, "%o %s%c",
1298 (unsigned int)(e->versions[v].mode & ~NO_DELTA),
1299 e->name->str_dat, '\0');
1300 strbuf_add(b, e->versions[v].oid.hash, the_hash_algo->rawsz);
1304 static void store_tree(struct tree_entry *root)
1306 struct tree_content *t;
1307 unsigned int i, j, del;
1308 struct last_object lo = { STRBUF_INIT, 0, 0, /* no_swap */ 1 };
1309 struct object_entry *le = NULL;
1311 if (!is_null_oid(&root->versions[1].oid))
1312 return;
1314 if (!root->tree)
1315 load_tree(root);
1316 t = root->tree;
1318 for (i = 0; i < t->entry_count; i++) {
1319 if (t->entries[i]->tree)
1320 store_tree(t->entries[i]);
1323 if (!(root->versions[0].mode & NO_DELTA))
1324 le = find_object(&root->versions[0].oid);
1325 if (S_ISDIR(root->versions[0].mode) && le && le->pack_id == pack_id) {
1326 mktree(t, 0, &old_tree);
1327 lo.data = old_tree;
1328 lo.offset = le->idx.offset;
1329 lo.depth = t->delta_depth;
1332 mktree(t, 1, &new_tree);
1333 store_object(OBJ_TREE, &new_tree, &lo, &root->versions[1].oid, 0);
1335 t->delta_depth = lo.depth;
1336 for (i = 0, j = 0, del = 0; i < t->entry_count; i++) {
1337 struct tree_entry *e = t->entries[i];
1338 if (e->versions[1].mode) {
1339 e->versions[0].mode = e->versions[1].mode;
1340 oidcpy(&e->versions[0].oid, &e->versions[1].oid);
1341 t->entries[j++] = e;
1342 } else {
1343 release_tree_entry(e);
1344 del++;
1347 t->entry_count -= del;
1350 static void tree_content_replace(
1351 struct tree_entry *root,
1352 const struct object_id *oid,
1353 const uint16_t mode,
1354 struct tree_content *newtree)
1356 if (!S_ISDIR(mode))
1357 die("Root cannot be a non-directory");
1358 oidclr(&root->versions[0].oid);
1359 oidcpy(&root->versions[1].oid, oid);
1360 if (root->tree)
1361 release_tree_content_recursive(root->tree);
1362 root->tree = newtree;
1365 static int tree_content_set(
1366 struct tree_entry *root,
1367 const char *p,
1368 const struct object_id *oid,
1369 const uint16_t mode,
1370 struct tree_content *subtree)
1372 struct tree_content *t;
1373 const char *slash1;
1374 unsigned int i, n;
1375 struct tree_entry *e;
1377 slash1 = strchrnul(p, '/');
1378 n = slash1 - p;
1379 if (!n)
1380 die("Empty path component found in input");
1381 if (!*slash1 && !S_ISDIR(mode) && subtree)
1382 die("Non-directories cannot have subtrees");
1384 if (!root->tree)
1385 load_tree(root);
1386 t = root->tree;
1387 for (i = 0; i < t->entry_count; i++) {
1388 e = t->entries[i];
1389 if (e->name->str_len == n && !fspathncmp(p, e->name->str_dat, n)) {
1390 if (!*slash1) {
1391 if (!S_ISDIR(mode)
1392 && e->versions[1].mode == mode
1393 && oideq(&e->versions[1].oid, oid))
1394 return 0;
1395 e->versions[1].mode = mode;
1396 oidcpy(&e->versions[1].oid, oid);
1397 if (e->tree)
1398 release_tree_content_recursive(e->tree);
1399 e->tree = subtree;
1402 * We need to leave e->versions[0].sha1 alone
1403 * to avoid modifying the preimage tree used
1404 * when writing out the parent directory.
1405 * But after replacing the subdir with a
1406 * completely different one, it's not a good
1407 * delta base any more, and besides, we've
1408 * thrown away the tree entries needed to
1409 * make a delta against it.
1411 * So let's just explicitly disable deltas
1412 * for the subtree.
1414 if (S_ISDIR(e->versions[0].mode))
1415 e->versions[0].mode |= NO_DELTA;
1417 oidclr(&root->versions[1].oid);
1418 return 1;
1420 if (!S_ISDIR(e->versions[1].mode)) {
1421 e->tree = new_tree_content(8);
1422 e->versions[1].mode = S_IFDIR;
1424 if (!e->tree)
1425 load_tree(e);
1426 if (tree_content_set(e, slash1 + 1, oid, mode, subtree)) {
1427 oidclr(&root->versions[1].oid);
1428 return 1;
1430 return 0;
1434 if (t->entry_count == t->entry_capacity)
1435 root->tree = t = grow_tree_content(t, t->entry_count);
1436 e = new_tree_entry();
1437 e->name = to_atom(p, n);
1438 e->versions[0].mode = 0;
1439 oidclr(&e->versions[0].oid);
1440 t->entries[t->entry_count++] = e;
1441 if (*slash1) {
1442 e->tree = new_tree_content(8);
1443 e->versions[1].mode = S_IFDIR;
1444 tree_content_set(e, slash1 + 1, oid, mode, subtree);
1445 } else {
1446 e->tree = subtree;
1447 e->versions[1].mode = mode;
1448 oidcpy(&e->versions[1].oid, oid);
1450 oidclr(&root->versions[1].oid);
1451 return 1;
1454 static int tree_content_remove(
1455 struct tree_entry *root,
1456 const char *p,
1457 struct tree_entry *backup_leaf,
1458 int allow_root)
1460 struct tree_content *t;
1461 const char *slash1;
1462 unsigned int i, n;
1463 struct tree_entry *e;
1465 slash1 = strchrnul(p, '/');
1466 n = slash1 - p;
1468 if (!root->tree)
1469 load_tree(root);
1471 if (!*p && allow_root) {
1472 e = root;
1473 goto del_entry;
1476 t = root->tree;
1477 for (i = 0; i < t->entry_count; i++) {
1478 e = t->entries[i];
1479 if (e->name->str_len == n && !fspathncmp(p, e->name->str_dat, n)) {
1480 if (*slash1 && !S_ISDIR(e->versions[1].mode))
1482 * If p names a file in some subdirectory, and a
1483 * file or symlink matching the name of the
1484 * parent directory of p exists, then p cannot
1485 * exist and need not be deleted.
1487 return 1;
1488 if (!*slash1 || !S_ISDIR(e->versions[1].mode))
1489 goto del_entry;
1490 if (!e->tree)
1491 load_tree(e);
1492 if (tree_content_remove(e, slash1 + 1, backup_leaf, 0)) {
1493 for (n = 0; n < e->tree->entry_count; n++) {
1494 if (e->tree->entries[n]->versions[1].mode) {
1495 oidclr(&root->versions[1].oid);
1496 return 1;
1499 backup_leaf = NULL;
1500 goto del_entry;
1502 return 0;
1505 return 0;
1507 del_entry:
1508 if (backup_leaf)
1509 memcpy(backup_leaf, e, sizeof(*backup_leaf));
1510 else if (e->tree)
1511 release_tree_content_recursive(e->tree);
1512 e->tree = NULL;
1513 e->versions[1].mode = 0;
1514 oidclr(&e->versions[1].oid);
1515 oidclr(&root->versions[1].oid);
1516 return 1;
1519 static int tree_content_get(
1520 struct tree_entry *root,
1521 const char *p,
1522 struct tree_entry *leaf,
1523 int allow_root)
1525 struct tree_content *t;
1526 const char *slash1;
1527 unsigned int i, n;
1528 struct tree_entry *e;
1530 slash1 = strchrnul(p, '/');
1531 n = slash1 - p;
1532 if (!n && !allow_root)
1533 die("Empty path component found in input");
1535 if (!root->tree)
1536 load_tree(root);
1538 if (!n) {
1539 e = root;
1540 goto found_entry;
1543 t = root->tree;
1544 for (i = 0; i < t->entry_count; i++) {
1545 e = t->entries[i];
1546 if (e->name->str_len == n && !fspathncmp(p, e->name->str_dat, n)) {
1547 if (!*slash1)
1548 goto found_entry;
1549 if (!S_ISDIR(e->versions[1].mode))
1550 return 0;
1551 if (!e->tree)
1552 load_tree(e);
1553 return tree_content_get(e, slash1 + 1, leaf, 0);
1556 return 0;
1558 found_entry:
1559 memcpy(leaf, e, sizeof(*leaf));
1560 if (e->tree && is_null_oid(&e->versions[1].oid))
1561 leaf->tree = dup_tree_content(e->tree);
1562 else
1563 leaf->tree = NULL;
1564 return 1;
1567 static int update_branch(struct branch *b)
1569 static const char *msg = "fast-import";
1570 struct ref_transaction *transaction;
1571 struct object_id old_oid;
1572 struct strbuf err = STRBUF_INIT;
1574 if (is_null_oid(&b->oid)) {
1575 if (b->delete)
1576 delete_ref(NULL, b->name, NULL, 0);
1577 return 0;
1579 if (read_ref(b->name, &old_oid))
1580 oidclr(&old_oid);
1581 if (!force_update && !is_null_oid(&old_oid)) {
1582 struct commit *old_cmit, *new_cmit;
1584 old_cmit = lookup_commit_reference_gently(the_repository,
1585 &old_oid, 0);
1586 new_cmit = lookup_commit_reference_gently(the_repository,
1587 &b->oid, 0);
1588 if (!old_cmit || !new_cmit)
1589 return error("Branch %s is missing commits.", b->name);
1591 if (!in_merge_bases(old_cmit, new_cmit)) {
1592 warning("Not updating %s"
1593 " (new tip %s does not contain %s)",
1594 b->name, oid_to_hex(&b->oid),
1595 oid_to_hex(&old_oid));
1596 return -1;
1599 transaction = ref_transaction_begin(&err);
1600 if (!transaction ||
1601 ref_transaction_update(transaction, b->name, &b->oid, &old_oid,
1602 0, msg, &err) ||
1603 ref_transaction_commit(transaction, &err)) {
1604 ref_transaction_free(transaction);
1605 error("%s", err.buf);
1606 strbuf_release(&err);
1607 return -1;
1609 ref_transaction_free(transaction);
1610 strbuf_release(&err);
1611 return 0;
1614 static void dump_branches(void)
1616 unsigned int i;
1617 struct branch *b;
1619 for (i = 0; i < branch_table_sz; i++) {
1620 for (b = branch_table[i]; b; b = b->table_next_branch)
1621 failure |= update_branch(b);
1625 static void dump_tags(void)
1627 static const char *msg = "fast-import";
1628 struct tag *t;
1629 struct strbuf ref_name = STRBUF_INIT;
1630 struct strbuf err = STRBUF_INIT;
1631 struct ref_transaction *transaction;
1633 transaction = ref_transaction_begin(&err);
1634 if (!transaction) {
1635 failure |= error("%s", err.buf);
1636 goto cleanup;
1638 for (t = first_tag; t; t = t->next_tag) {
1639 strbuf_reset(&ref_name);
1640 strbuf_addf(&ref_name, "refs/tags/%s", t->name);
1642 if (ref_transaction_update(transaction, ref_name.buf,
1643 &t->oid, NULL, 0, msg, &err)) {
1644 failure |= error("%s", err.buf);
1645 goto cleanup;
1648 if (ref_transaction_commit(transaction, &err))
1649 failure |= error("%s", err.buf);
1651 cleanup:
1652 ref_transaction_free(transaction);
1653 strbuf_release(&ref_name);
1654 strbuf_release(&err);
1657 static void dump_marks_helper(FILE *f,
1658 uintmax_t base,
1659 struct mark_set *m)
1661 uintmax_t k;
1662 if (m->shift) {
1663 for (k = 0; k < 1024; k++) {
1664 if (m->data.sets[k])
1665 dump_marks_helper(f, base + (k << m->shift),
1666 m->data.sets[k]);
1668 } else {
1669 for (k = 0; k < 1024; k++) {
1670 if (m->data.marked[k])
1671 fprintf(f, ":%" PRIuMAX " %s\n", base + k,
1672 oid_to_hex(&m->data.marked[k]->idx.oid));
1677 static void dump_marks(void)
1679 struct lock_file mark_lock = LOCK_INIT;
1680 FILE *f;
1682 if (!export_marks_file || (import_marks_file && !import_marks_file_done))
1683 return;
1685 if (hold_lock_file_for_update(&mark_lock, export_marks_file, 0) < 0) {
1686 failure |= error_errno("Unable to write marks file %s",
1687 export_marks_file);
1688 return;
1691 f = fdopen_lock_file(&mark_lock, "w");
1692 if (!f) {
1693 int saved_errno = errno;
1694 rollback_lock_file(&mark_lock);
1695 failure |= error("Unable to write marks file %s: %s",
1696 export_marks_file, strerror(saved_errno));
1697 return;
1700 dump_marks_helper(f, 0, marks);
1701 if (commit_lock_file(&mark_lock)) {
1702 failure |= error_errno("Unable to write file %s",
1703 export_marks_file);
1704 return;
1708 static void read_marks(void)
1710 char line[512];
1711 FILE *f = fopen(import_marks_file, "r");
1712 if (f)
1714 else if (import_marks_file_ignore_missing && errno == ENOENT)
1715 goto done; /* Marks file does not exist */
1716 else
1717 die_errno("cannot read '%s'", import_marks_file);
1718 while (fgets(line, sizeof(line), f)) {
1719 uintmax_t mark;
1720 char *end;
1721 struct object_id oid;
1722 struct object_entry *e;
1724 end = strchr(line, '\n');
1725 if (line[0] != ':' || !end)
1726 die("corrupt mark line: %s", line);
1727 *end = 0;
1728 mark = strtoumax(line + 1, &end, 10);
1729 if (!mark || end == line + 1
1730 || *end != ' ' || get_oid_hex(end + 1, &oid))
1731 die("corrupt mark line: %s", line);
1732 e = find_object(&oid);
1733 if (!e) {
1734 enum object_type type = oid_object_info(the_repository,
1735 &oid, NULL);
1736 if (type < 0)
1737 die("object not found: %s", oid_to_hex(&oid));
1738 e = insert_object(&oid);
1739 e->type = type;
1740 e->pack_id = MAX_PACK_ID;
1741 e->idx.offset = 1; /* just not zero! */
1743 insert_mark(mark, e);
1745 fclose(f);
1746 done:
1747 import_marks_file_done = 1;
1751 static int read_next_command(void)
1753 static int stdin_eof = 0;
1755 if (stdin_eof) {
1756 unread_command_buf = 0;
1757 return EOF;
1760 for (;;) {
1761 if (unread_command_buf) {
1762 unread_command_buf = 0;
1763 } else {
1764 struct recent_command *rc;
1766 stdin_eof = strbuf_getline_lf(&command_buf, stdin);
1767 if (stdin_eof)
1768 return EOF;
1770 if (!seen_data_command
1771 && !starts_with(command_buf.buf, "feature ")
1772 && !starts_with(command_buf.buf, "option ")) {
1773 parse_argv();
1776 rc = rc_free;
1777 if (rc)
1778 rc_free = rc->next;
1779 else {
1780 rc = cmd_hist.next;
1781 cmd_hist.next = rc->next;
1782 cmd_hist.next->prev = &cmd_hist;
1783 free(rc->buf);
1786 rc->buf = xstrdup(command_buf.buf);
1787 rc->prev = cmd_tail;
1788 rc->next = cmd_hist.prev;
1789 rc->prev->next = rc;
1790 cmd_tail = rc;
1792 if (command_buf.buf[0] == '#')
1793 continue;
1794 return 0;
1798 static void skip_optional_lf(void)
1800 int term_char = fgetc(stdin);
1801 if (term_char != '\n' && term_char != EOF)
1802 ungetc(term_char, stdin);
1805 static void parse_mark(void)
1807 const char *v;
1808 if (skip_prefix(command_buf.buf, "mark :", &v)) {
1809 next_mark = strtoumax(v, NULL, 10);
1810 read_next_command();
1812 else
1813 next_mark = 0;
1816 static void parse_original_identifier(void)
1818 const char *v;
1819 if (skip_prefix(command_buf.buf, "original-oid ", &v))
1820 read_next_command();
1823 static int parse_data(struct strbuf *sb, uintmax_t limit, uintmax_t *len_res)
1825 const char *data;
1826 strbuf_reset(sb);
1828 if (!skip_prefix(command_buf.buf, "data ", &data))
1829 die("Expected 'data n' command, found: %s", command_buf.buf);
1831 if (skip_prefix(data, "<<", &data)) {
1832 char *term = xstrdup(data);
1833 size_t term_len = command_buf.len - (data - command_buf.buf);
1835 for (;;) {
1836 if (strbuf_getline_lf(&command_buf, stdin) == EOF)
1837 die("EOF in data (terminator '%s' not found)", term);
1838 if (term_len == command_buf.len
1839 && !strcmp(term, command_buf.buf))
1840 break;
1841 strbuf_addbuf(sb, &command_buf);
1842 strbuf_addch(sb, '\n');
1844 free(term);
1846 else {
1847 uintmax_t len = strtoumax(data, NULL, 10);
1848 size_t n = 0, length = (size_t)len;
1850 if (limit && limit < len) {
1851 *len_res = len;
1852 return 0;
1854 if (length < len)
1855 die("data is too large to use in this context");
1857 while (n < length) {
1858 size_t s = strbuf_fread(sb, length - n, stdin);
1859 if (!s && feof(stdin))
1860 die("EOF in data (%lu bytes remaining)",
1861 (unsigned long)(length - n));
1862 n += s;
1866 skip_optional_lf();
1867 return 1;
1870 static int validate_raw_date(const char *src, struct strbuf *result)
1872 const char *orig_src = src;
1873 char *endp;
1874 unsigned long num;
1876 errno = 0;
1878 num = strtoul(src, &endp, 10);
1879 /* NEEDSWORK: perhaps check for reasonable values? */
1880 if (errno || endp == src || *endp != ' ')
1881 return -1;
1883 src = endp + 1;
1884 if (*src != '-' && *src != '+')
1885 return -1;
1887 num = strtoul(src + 1, &endp, 10);
1888 if (errno || endp == src + 1 || *endp || 1400 < num)
1889 return -1;
1891 strbuf_addstr(result, orig_src);
1892 return 0;
1895 static char *parse_ident(const char *buf)
1897 const char *ltgt;
1898 size_t name_len;
1899 struct strbuf ident = STRBUF_INIT;
1901 /* ensure there is a space delimiter even if there is no name */
1902 if (*buf == '<')
1903 --buf;
1905 ltgt = buf + strcspn(buf, "<>");
1906 if (*ltgt != '<')
1907 die("Missing < in ident string: %s", buf);
1908 if (ltgt != buf && ltgt[-1] != ' ')
1909 die("Missing space before < in ident string: %s", buf);
1910 ltgt = ltgt + 1 + strcspn(ltgt + 1, "<>");
1911 if (*ltgt != '>')
1912 die("Missing > in ident string: %s", buf);
1913 ltgt++;
1914 if (*ltgt != ' ')
1915 die("Missing space after > in ident string: %s", buf);
1916 ltgt++;
1917 name_len = ltgt - buf;
1918 strbuf_add(&ident, buf, name_len);
1920 switch (whenspec) {
1921 case WHENSPEC_RAW:
1922 if (validate_raw_date(ltgt, &ident) < 0)
1923 die("Invalid raw date \"%s\" in ident: %s", ltgt, buf);
1924 break;
1925 case WHENSPEC_RFC2822:
1926 if (parse_date(ltgt, &ident) < 0)
1927 die("Invalid rfc2822 date \"%s\" in ident: %s", ltgt, buf);
1928 break;
1929 case WHENSPEC_NOW:
1930 if (strcmp("now", ltgt))
1931 die("Date in ident must be 'now': %s", buf);
1932 datestamp(&ident);
1933 break;
1936 return strbuf_detach(&ident, NULL);
1939 static void parse_and_store_blob(
1940 struct last_object *last,
1941 struct object_id *oidout,
1942 uintmax_t mark)
1944 static struct strbuf buf = STRBUF_INIT;
1945 uintmax_t len;
1947 if (parse_data(&buf, big_file_threshold, &len))
1948 store_object(OBJ_BLOB, &buf, last, oidout, mark);
1949 else {
1950 if (last) {
1951 strbuf_release(&last->data);
1952 last->offset = 0;
1953 last->depth = 0;
1955 stream_blob(len, oidout, mark);
1956 skip_optional_lf();
1960 static void parse_new_blob(void)
1962 read_next_command();
1963 parse_mark();
1964 parse_original_identifier();
1965 parse_and_store_blob(&last_blob, NULL, next_mark);
1968 static void unload_one_branch(void)
1970 while (cur_active_branches
1971 && cur_active_branches >= max_active_branches) {
1972 uintmax_t min_commit = ULONG_MAX;
1973 struct branch *e, *l = NULL, *p = NULL;
1975 for (e = active_branches; e; e = e->active_next_branch) {
1976 if (e->last_commit < min_commit) {
1977 p = l;
1978 min_commit = e->last_commit;
1980 l = e;
1983 if (p) {
1984 e = p->active_next_branch;
1985 p->active_next_branch = e->active_next_branch;
1986 } else {
1987 e = active_branches;
1988 active_branches = e->active_next_branch;
1990 e->active = 0;
1991 e->active_next_branch = NULL;
1992 if (e->branch_tree.tree) {
1993 release_tree_content_recursive(e->branch_tree.tree);
1994 e->branch_tree.tree = NULL;
1996 cur_active_branches--;
2000 static void load_branch(struct branch *b)
2002 load_tree(&b->branch_tree);
2003 if (!b->active) {
2004 b->active = 1;
2005 b->active_next_branch = active_branches;
2006 active_branches = b;
2007 cur_active_branches++;
2008 branch_load_count++;
2012 static unsigned char convert_num_notes_to_fanout(uintmax_t num_notes)
2014 unsigned char fanout = 0;
2015 while ((num_notes >>= 8))
2016 fanout++;
2017 return fanout;
2020 static void construct_path_with_fanout(const char *hex_sha1,
2021 unsigned char fanout, char *path)
2023 unsigned int i = 0, j = 0;
2024 if (fanout >= the_hash_algo->rawsz)
2025 die("Too large fanout (%u)", fanout);
2026 while (fanout) {
2027 path[i++] = hex_sha1[j++];
2028 path[i++] = hex_sha1[j++];
2029 path[i++] = '/';
2030 fanout--;
2032 memcpy(path + i, hex_sha1 + j, the_hash_algo->hexsz - j);
2033 path[i + the_hash_algo->hexsz - j] = '\0';
2036 static uintmax_t do_change_note_fanout(
2037 struct tree_entry *orig_root, struct tree_entry *root,
2038 char *hex_oid, unsigned int hex_oid_len,
2039 char *fullpath, unsigned int fullpath_len,
2040 unsigned char fanout)
2042 struct tree_content *t;
2043 struct tree_entry *e, leaf;
2044 unsigned int i, tmp_hex_oid_len, tmp_fullpath_len;
2045 uintmax_t num_notes = 0;
2046 struct object_id oid;
2047 /* hex oid + '/' between each pair of hex digits + NUL */
2048 char realpath[GIT_MAX_HEXSZ + ((GIT_MAX_HEXSZ / 2) - 1) + 1];
2049 const unsigned hexsz = the_hash_algo->hexsz;
2051 if (!root->tree)
2052 load_tree(root);
2053 t = root->tree;
2055 for (i = 0; t && i < t->entry_count; i++) {
2056 e = t->entries[i];
2057 tmp_hex_oid_len = hex_oid_len + e->name->str_len;
2058 tmp_fullpath_len = fullpath_len;
2061 * We're interested in EITHER existing note entries (entries
2062 * with exactly 40 hex chars in path, not including directory
2063 * separators), OR directory entries that may contain note
2064 * entries (with < 40 hex chars in path).
2065 * Also, each path component in a note entry must be a multiple
2066 * of 2 chars.
2068 if (!e->versions[1].mode ||
2069 tmp_hex_oid_len > hexsz ||
2070 e->name->str_len % 2)
2071 continue;
2073 /* This _may_ be a note entry, or a subdir containing notes */
2074 memcpy(hex_oid + hex_oid_len, e->name->str_dat,
2075 e->name->str_len);
2076 if (tmp_fullpath_len)
2077 fullpath[tmp_fullpath_len++] = '/';
2078 memcpy(fullpath + tmp_fullpath_len, e->name->str_dat,
2079 e->name->str_len);
2080 tmp_fullpath_len += e->name->str_len;
2081 fullpath[tmp_fullpath_len] = '\0';
2083 if (tmp_hex_oid_len == hexsz && !get_oid_hex(hex_oid, &oid)) {
2084 /* This is a note entry */
2085 if (fanout == 0xff) {
2086 /* Counting mode, no rename */
2087 num_notes++;
2088 continue;
2090 construct_path_with_fanout(hex_oid, fanout, realpath);
2091 if (!strcmp(fullpath, realpath)) {
2092 /* Note entry is in correct location */
2093 num_notes++;
2094 continue;
2097 /* Rename fullpath to realpath */
2098 if (!tree_content_remove(orig_root, fullpath, &leaf, 0))
2099 die("Failed to remove path %s", fullpath);
2100 tree_content_set(orig_root, realpath,
2101 &leaf.versions[1].oid,
2102 leaf.versions[1].mode,
2103 leaf.tree);
2104 } else if (S_ISDIR(e->versions[1].mode)) {
2105 /* This is a subdir that may contain note entries */
2106 num_notes += do_change_note_fanout(orig_root, e,
2107 hex_oid, tmp_hex_oid_len,
2108 fullpath, tmp_fullpath_len, fanout);
2111 /* The above may have reallocated the current tree_content */
2112 t = root->tree;
2114 return num_notes;
2117 static uintmax_t change_note_fanout(struct tree_entry *root,
2118 unsigned char fanout)
2121 * The size of path is due to one slash between every two hex digits,
2122 * plus the terminating NUL. Note that there is no slash at the end, so
2123 * the number of slashes is one less than half the number of hex
2124 * characters.
2126 char hex_oid[GIT_MAX_HEXSZ], path[GIT_MAX_HEXSZ + (GIT_MAX_HEXSZ / 2) - 1 + 1];
2127 return do_change_note_fanout(root, root, hex_oid, 0, path, 0, fanout);
2131 * Given a pointer into a string, parse a mark reference:
2133 * idnum ::= ':' bigint;
2135 * Return the first character after the value in *endptr.
2137 * Complain if the following character is not what is expected,
2138 * either a space or end of the string.
2140 static uintmax_t parse_mark_ref(const char *p, char **endptr)
2142 uintmax_t mark;
2144 assert(*p == ':');
2145 p++;
2146 mark = strtoumax(p, endptr, 10);
2147 if (*endptr == p)
2148 die("No value after ':' in mark: %s", command_buf.buf);
2149 return mark;
2153 * Parse the mark reference, and complain if this is not the end of
2154 * the string.
2156 static uintmax_t parse_mark_ref_eol(const char *p)
2158 char *end;
2159 uintmax_t mark;
2161 mark = parse_mark_ref(p, &end);
2162 if (*end != '\0')
2163 die("Garbage after mark: %s", command_buf.buf);
2164 return mark;
2168 * Parse the mark reference, demanding a trailing space. Return a
2169 * pointer to the space.
2171 static uintmax_t parse_mark_ref_space(const char **p)
2173 uintmax_t mark;
2174 char *end;
2176 mark = parse_mark_ref(*p, &end);
2177 if (*end++ != ' ')
2178 die("Missing space after mark: %s", command_buf.buf);
2179 *p = end;
2180 return mark;
2183 static void file_change_m(const char *p, struct branch *b)
2185 static struct strbuf uq = STRBUF_INIT;
2186 const char *endp;
2187 struct object_entry *oe;
2188 struct object_id oid;
2189 uint16_t mode, inline_data = 0;
2191 p = get_mode(p, &mode);
2192 if (!p)
2193 die("Corrupt mode: %s", command_buf.buf);
2194 switch (mode) {
2195 case 0644:
2196 case 0755:
2197 mode |= S_IFREG;
2198 case S_IFREG | 0644:
2199 case S_IFREG | 0755:
2200 case S_IFLNK:
2201 case S_IFDIR:
2202 case S_IFGITLINK:
2203 /* ok */
2204 break;
2205 default:
2206 die("Corrupt mode: %s", command_buf.buf);
2209 if (*p == ':') {
2210 oe = find_mark(parse_mark_ref_space(&p));
2211 oidcpy(&oid, &oe->idx.oid);
2212 } else if (skip_prefix(p, "inline ", &p)) {
2213 inline_data = 1;
2214 oe = NULL; /* not used with inline_data, but makes gcc happy */
2215 } else {
2216 if (parse_oid_hex(p, &oid, &p))
2217 die("Invalid dataref: %s", command_buf.buf);
2218 oe = find_object(&oid);
2219 if (*p++ != ' ')
2220 die("Missing space after SHA1: %s", command_buf.buf);
2223 strbuf_reset(&uq);
2224 if (!unquote_c_style(&uq, p, &endp)) {
2225 if (*endp)
2226 die("Garbage after path in: %s", command_buf.buf);
2227 p = uq.buf;
2230 /* Git does not track empty, non-toplevel directories. */
2231 if (S_ISDIR(mode) && is_empty_tree_oid(&oid) && *p) {
2232 tree_content_remove(&b->branch_tree, p, NULL, 0);
2233 return;
2236 if (S_ISGITLINK(mode)) {
2237 if (inline_data)
2238 die("Git links cannot be specified 'inline': %s",
2239 command_buf.buf);
2240 else if (oe) {
2241 if (oe->type != OBJ_COMMIT)
2242 die("Not a commit (actually a %s): %s",
2243 type_name(oe->type), command_buf.buf);
2246 * Accept the sha1 without checking; it expected to be in
2247 * another repository.
2249 } else if (inline_data) {
2250 if (S_ISDIR(mode))
2251 die("Directories cannot be specified 'inline': %s",
2252 command_buf.buf);
2253 if (p != uq.buf) {
2254 strbuf_addstr(&uq, p);
2255 p = uq.buf;
2257 while (read_next_command() != EOF) {
2258 const char *v;
2259 if (skip_prefix(command_buf.buf, "cat-blob ", &v))
2260 parse_cat_blob(v);
2261 else {
2262 parse_and_store_blob(&last_blob, &oid, 0);
2263 break;
2266 } else {
2267 enum object_type expected = S_ISDIR(mode) ?
2268 OBJ_TREE: OBJ_BLOB;
2269 enum object_type type = oe ? oe->type :
2270 oid_object_info(the_repository, &oid,
2271 NULL);
2272 if (type < 0)
2273 die("%s not found: %s",
2274 S_ISDIR(mode) ? "Tree" : "Blob",
2275 command_buf.buf);
2276 if (type != expected)
2277 die("Not a %s (actually a %s): %s",
2278 type_name(expected), type_name(type),
2279 command_buf.buf);
2282 if (!*p) {
2283 tree_content_replace(&b->branch_tree, &oid, mode, NULL);
2284 return;
2286 tree_content_set(&b->branch_tree, p, &oid, mode, NULL);
2289 static void file_change_d(const char *p, struct branch *b)
2291 static struct strbuf uq = STRBUF_INIT;
2292 const char *endp;
2294 strbuf_reset(&uq);
2295 if (!unquote_c_style(&uq, p, &endp)) {
2296 if (*endp)
2297 die("Garbage after path in: %s", command_buf.buf);
2298 p = uq.buf;
2300 tree_content_remove(&b->branch_tree, p, NULL, 1);
2303 static void file_change_cr(const char *s, struct branch *b, int rename)
2305 const char *d;
2306 static struct strbuf s_uq = STRBUF_INIT;
2307 static struct strbuf d_uq = STRBUF_INIT;
2308 const char *endp;
2309 struct tree_entry leaf;
2311 strbuf_reset(&s_uq);
2312 if (!unquote_c_style(&s_uq, s, &endp)) {
2313 if (*endp != ' ')
2314 die("Missing space after source: %s", command_buf.buf);
2315 } else {
2316 endp = strchr(s, ' ');
2317 if (!endp)
2318 die("Missing space after source: %s", command_buf.buf);
2319 strbuf_add(&s_uq, s, endp - s);
2321 s = s_uq.buf;
2323 endp++;
2324 if (!*endp)
2325 die("Missing dest: %s", command_buf.buf);
2327 d = endp;
2328 strbuf_reset(&d_uq);
2329 if (!unquote_c_style(&d_uq, d, &endp)) {
2330 if (*endp)
2331 die("Garbage after dest in: %s", command_buf.buf);
2332 d = d_uq.buf;
2335 memset(&leaf, 0, sizeof(leaf));
2336 if (rename)
2337 tree_content_remove(&b->branch_tree, s, &leaf, 1);
2338 else
2339 tree_content_get(&b->branch_tree, s, &leaf, 1);
2340 if (!leaf.versions[1].mode)
2341 die("Path %s not in branch", s);
2342 if (!*d) { /* C "path/to/subdir" "" */
2343 tree_content_replace(&b->branch_tree,
2344 &leaf.versions[1].oid,
2345 leaf.versions[1].mode,
2346 leaf.tree);
2347 return;
2349 tree_content_set(&b->branch_tree, d,
2350 &leaf.versions[1].oid,
2351 leaf.versions[1].mode,
2352 leaf.tree);
2355 static void note_change_n(const char *p, struct branch *b, unsigned char *old_fanout)
2357 static struct strbuf uq = STRBUF_INIT;
2358 struct object_entry *oe;
2359 struct branch *s;
2360 struct object_id oid, commit_oid;
2361 char path[GIT_MAX_RAWSZ * 3];
2362 uint16_t inline_data = 0;
2363 unsigned char new_fanout;
2366 * When loading a branch, we don't traverse its tree to count the real
2367 * number of notes (too expensive to do this for all non-note refs).
2368 * This means that recently loaded notes refs might incorrectly have
2369 * b->num_notes == 0, and consequently, old_fanout might be wrong.
2371 * Fix this by traversing the tree and counting the number of notes
2372 * when b->num_notes == 0. If the notes tree is truly empty, the
2373 * calculation should not take long.
2375 if (b->num_notes == 0 && *old_fanout == 0) {
2376 /* Invoke change_note_fanout() in "counting mode". */
2377 b->num_notes = change_note_fanout(&b->branch_tree, 0xff);
2378 *old_fanout = convert_num_notes_to_fanout(b->num_notes);
2381 /* Now parse the notemodify command. */
2382 /* <dataref> or 'inline' */
2383 if (*p == ':') {
2384 oe = find_mark(parse_mark_ref_space(&p));
2385 oidcpy(&oid, &oe->idx.oid);
2386 } else if (skip_prefix(p, "inline ", &p)) {
2387 inline_data = 1;
2388 oe = NULL; /* not used with inline_data, but makes gcc happy */
2389 } else {
2390 if (parse_oid_hex(p, &oid, &p))
2391 die("Invalid dataref: %s", command_buf.buf);
2392 oe = find_object(&oid);
2393 if (*p++ != ' ')
2394 die("Missing space after SHA1: %s", command_buf.buf);
2397 /* <commit-ish> */
2398 s = lookup_branch(p);
2399 if (s) {
2400 if (is_null_oid(&s->oid))
2401 die("Can't add a note on empty branch.");
2402 oidcpy(&commit_oid, &s->oid);
2403 } else if (*p == ':') {
2404 uintmax_t commit_mark = parse_mark_ref_eol(p);
2405 struct object_entry *commit_oe = find_mark(commit_mark);
2406 if (commit_oe->type != OBJ_COMMIT)
2407 die("Mark :%" PRIuMAX " not a commit", commit_mark);
2408 oidcpy(&commit_oid, &commit_oe->idx.oid);
2409 } else if (!get_oid(p, &commit_oid)) {
2410 unsigned long size;
2411 char *buf = read_object_with_reference(the_repository,
2412 &commit_oid,
2413 commit_type, &size,
2414 &commit_oid);
2415 if (!buf || size < the_hash_algo->hexsz + 6)
2416 die("Not a valid commit: %s", p);
2417 free(buf);
2418 } else
2419 die("Invalid ref name or SHA1 expression: %s", p);
2421 if (inline_data) {
2422 if (p != uq.buf) {
2423 strbuf_addstr(&uq, p);
2424 p = uq.buf;
2426 read_next_command();
2427 parse_and_store_blob(&last_blob, &oid, 0);
2428 } else if (oe) {
2429 if (oe->type != OBJ_BLOB)
2430 die("Not a blob (actually a %s): %s",
2431 type_name(oe->type), command_buf.buf);
2432 } else if (!is_null_oid(&oid)) {
2433 enum object_type type = oid_object_info(the_repository, &oid,
2434 NULL);
2435 if (type < 0)
2436 die("Blob not found: %s", command_buf.buf);
2437 if (type != OBJ_BLOB)
2438 die("Not a blob (actually a %s): %s",
2439 type_name(type), command_buf.buf);
2442 construct_path_with_fanout(oid_to_hex(&commit_oid), *old_fanout, path);
2443 if (tree_content_remove(&b->branch_tree, path, NULL, 0))
2444 b->num_notes--;
2446 if (is_null_oid(&oid))
2447 return; /* nothing to insert */
2449 b->num_notes++;
2450 new_fanout = convert_num_notes_to_fanout(b->num_notes);
2451 construct_path_with_fanout(oid_to_hex(&commit_oid), new_fanout, path);
2452 tree_content_set(&b->branch_tree, path, &oid, S_IFREG | 0644, NULL);
2455 static void file_change_deleteall(struct branch *b)
2457 release_tree_content_recursive(b->branch_tree.tree);
2458 oidclr(&b->branch_tree.versions[0].oid);
2459 oidclr(&b->branch_tree.versions[1].oid);
2460 load_tree(&b->branch_tree);
2461 b->num_notes = 0;
2464 static void parse_from_commit(struct branch *b, char *buf, unsigned long size)
2466 if (!buf || size < the_hash_algo->hexsz + 6)
2467 die("Not a valid commit: %s", oid_to_hex(&b->oid));
2468 if (memcmp("tree ", buf, 5)
2469 || get_oid_hex(buf + 5, &b->branch_tree.versions[1].oid))
2470 die("The commit %s is corrupt", oid_to_hex(&b->oid));
2471 oidcpy(&b->branch_tree.versions[0].oid,
2472 &b->branch_tree.versions[1].oid);
2475 static void parse_from_existing(struct branch *b)
2477 if (is_null_oid(&b->oid)) {
2478 oidclr(&b->branch_tree.versions[0].oid);
2479 oidclr(&b->branch_tree.versions[1].oid);
2480 } else {
2481 unsigned long size;
2482 char *buf;
2484 buf = read_object_with_reference(the_repository,
2485 &b->oid, commit_type, &size,
2486 &b->oid);
2487 parse_from_commit(b, buf, size);
2488 free(buf);
2492 static int parse_objectish(struct branch *b, const char *objectish)
2494 struct branch *s;
2495 struct object_id oid;
2497 oidcpy(&oid, &b->branch_tree.versions[1].oid);
2499 s = lookup_branch(objectish);
2500 if (b == s)
2501 die("Can't create a branch from itself: %s", b->name);
2502 else if (s) {
2503 struct object_id *t = &s->branch_tree.versions[1].oid;
2504 oidcpy(&b->oid, &s->oid);
2505 oidcpy(&b->branch_tree.versions[0].oid, t);
2506 oidcpy(&b->branch_tree.versions[1].oid, t);
2507 } else if (*objectish == ':') {
2508 uintmax_t idnum = parse_mark_ref_eol(objectish);
2509 struct object_entry *oe = find_mark(idnum);
2510 if (oe->type != OBJ_COMMIT)
2511 die("Mark :%" PRIuMAX " not a commit", idnum);
2512 if (!oideq(&b->oid, &oe->idx.oid)) {
2513 oidcpy(&b->oid, &oe->idx.oid);
2514 if (oe->pack_id != MAX_PACK_ID) {
2515 unsigned long size;
2516 char *buf = gfi_unpack_entry(oe, &size);
2517 parse_from_commit(b, buf, size);
2518 free(buf);
2519 } else
2520 parse_from_existing(b);
2522 } else if (!get_oid(objectish, &b->oid)) {
2523 parse_from_existing(b);
2524 if (is_null_oid(&b->oid))
2525 b->delete = 1;
2527 else
2528 die("Invalid ref name or SHA1 expression: %s", objectish);
2530 if (b->branch_tree.tree && !oideq(&oid, &b->branch_tree.versions[1].oid)) {
2531 release_tree_content_recursive(b->branch_tree.tree);
2532 b->branch_tree.tree = NULL;
2535 read_next_command();
2536 return 1;
2539 static int parse_from(struct branch *b)
2541 const char *from;
2543 if (!skip_prefix(command_buf.buf, "from ", &from))
2544 return 0;
2546 return parse_objectish(b, from);
2549 static int parse_objectish_with_prefix(struct branch *b, const char *prefix)
2551 const char *base;
2553 if (!skip_prefix(command_buf.buf, prefix, &base))
2554 return 0;
2556 return parse_objectish(b, base);
2559 static struct hash_list *parse_merge(unsigned int *count)
2561 struct hash_list *list = NULL, **tail = &list, *n;
2562 const char *from;
2563 struct branch *s;
2565 *count = 0;
2566 while (skip_prefix(command_buf.buf, "merge ", &from)) {
2567 n = xmalloc(sizeof(*n));
2568 s = lookup_branch(from);
2569 if (s)
2570 oidcpy(&n->oid, &s->oid);
2571 else if (*from == ':') {
2572 uintmax_t idnum = parse_mark_ref_eol(from);
2573 struct object_entry *oe = find_mark(idnum);
2574 if (oe->type != OBJ_COMMIT)
2575 die("Mark :%" PRIuMAX " not a commit", idnum);
2576 oidcpy(&n->oid, &oe->idx.oid);
2577 } else if (!get_oid(from, &n->oid)) {
2578 unsigned long size;
2579 char *buf = read_object_with_reference(the_repository,
2580 &n->oid,
2581 commit_type,
2582 &size, &n->oid);
2583 if (!buf || size < the_hash_algo->hexsz + 6)
2584 die("Not a valid commit: %s", from);
2585 free(buf);
2586 } else
2587 die("Invalid ref name or SHA1 expression: %s", from);
2589 n->next = NULL;
2590 *tail = n;
2591 tail = &n->next;
2593 (*count)++;
2594 read_next_command();
2596 return list;
2599 static void parse_new_commit(const char *arg)
2601 static struct strbuf msg = STRBUF_INIT;
2602 struct branch *b;
2603 char *author = NULL;
2604 char *committer = NULL;
2605 char *encoding = NULL;
2606 struct hash_list *merge_list = NULL;
2607 unsigned int merge_count;
2608 unsigned char prev_fanout, new_fanout;
2609 const char *v;
2611 b = lookup_branch(arg);
2612 if (!b)
2613 b = new_branch(arg);
2615 read_next_command();
2616 parse_mark();
2617 parse_original_identifier();
2618 if (skip_prefix(command_buf.buf, "author ", &v)) {
2619 author = parse_ident(v);
2620 read_next_command();
2622 if (skip_prefix(command_buf.buf, "committer ", &v)) {
2623 committer = parse_ident(v);
2624 read_next_command();
2626 if (!committer)
2627 die("Expected committer but didn't get one");
2628 if (skip_prefix(command_buf.buf, "encoding ", &v)) {
2629 encoding = xstrdup(v);
2630 read_next_command();
2632 parse_data(&msg, 0, NULL);
2633 read_next_command();
2634 parse_from(b);
2635 merge_list = parse_merge(&merge_count);
2637 /* ensure the branch is active/loaded */
2638 if (!b->branch_tree.tree || !max_active_branches) {
2639 unload_one_branch();
2640 load_branch(b);
2643 prev_fanout = convert_num_notes_to_fanout(b->num_notes);
2645 /* file_change* */
2646 while (command_buf.len > 0) {
2647 if (skip_prefix(command_buf.buf, "M ", &v))
2648 file_change_m(v, b);
2649 else if (skip_prefix(command_buf.buf, "D ", &v))
2650 file_change_d(v, b);
2651 else if (skip_prefix(command_buf.buf, "R ", &v))
2652 file_change_cr(v, b, 1);
2653 else if (skip_prefix(command_buf.buf, "C ", &v))
2654 file_change_cr(v, b, 0);
2655 else if (skip_prefix(command_buf.buf, "N ", &v))
2656 note_change_n(v, b, &prev_fanout);
2657 else if (!strcmp("deleteall", command_buf.buf))
2658 file_change_deleteall(b);
2659 else if (skip_prefix(command_buf.buf, "ls ", &v))
2660 parse_ls(v, b);
2661 else if (skip_prefix(command_buf.buf, "cat-blob ", &v))
2662 parse_cat_blob(v);
2663 else {
2664 unread_command_buf = 1;
2665 break;
2667 if (read_next_command() == EOF)
2668 break;
2671 new_fanout = convert_num_notes_to_fanout(b->num_notes);
2672 if (new_fanout != prev_fanout)
2673 b->num_notes = change_note_fanout(&b->branch_tree, new_fanout);
2675 /* build the tree and the commit */
2676 store_tree(&b->branch_tree);
2677 oidcpy(&b->branch_tree.versions[0].oid,
2678 &b->branch_tree.versions[1].oid);
2680 strbuf_reset(&new_data);
2681 strbuf_addf(&new_data, "tree %s\n",
2682 oid_to_hex(&b->branch_tree.versions[1].oid));
2683 if (!is_null_oid(&b->oid))
2684 strbuf_addf(&new_data, "parent %s\n",
2685 oid_to_hex(&b->oid));
2686 while (merge_list) {
2687 struct hash_list *next = merge_list->next;
2688 strbuf_addf(&new_data, "parent %s\n",
2689 oid_to_hex(&merge_list->oid));
2690 free(merge_list);
2691 merge_list = next;
2693 strbuf_addf(&new_data,
2694 "author %s\n"
2695 "committer %s\n",
2696 author ? author : committer, committer);
2697 if (encoding)
2698 strbuf_addf(&new_data,
2699 "encoding %s\n",
2700 encoding);
2701 strbuf_addch(&new_data, '\n');
2702 strbuf_addbuf(&new_data, &msg);
2703 free(author);
2704 free(committer);
2705 free(encoding);
2707 if (!store_object(OBJ_COMMIT, &new_data, NULL, &b->oid, next_mark))
2708 b->pack_id = pack_id;
2709 b->last_commit = object_count_by_type[OBJ_COMMIT];
2712 static void parse_new_tag(const char *arg)
2714 static struct strbuf msg = STRBUF_INIT;
2715 const char *from;
2716 char *tagger;
2717 struct branch *s;
2718 struct tag *t;
2719 uintmax_t from_mark = 0;
2720 struct object_id oid;
2721 enum object_type type;
2722 const char *v;
2724 t = mem_pool_alloc(&fi_mem_pool, sizeof(struct tag));
2725 memset(t, 0, sizeof(struct tag));
2726 t->name = pool_strdup(arg);
2727 if (last_tag)
2728 last_tag->next_tag = t;
2729 else
2730 first_tag = t;
2731 last_tag = t;
2732 read_next_command();
2733 parse_mark();
2735 /* from ... */
2736 if (!skip_prefix(command_buf.buf, "from ", &from))
2737 die("Expected from command, got %s", command_buf.buf);
2738 s = lookup_branch(from);
2739 if (s) {
2740 if (is_null_oid(&s->oid))
2741 die("Can't tag an empty branch.");
2742 oidcpy(&oid, &s->oid);
2743 type = OBJ_COMMIT;
2744 } else if (*from == ':') {
2745 struct object_entry *oe;
2746 from_mark = parse_mark_ref_eol(from);
2747 oe = find_mark(from_mark);
2748 type = oe->type;
2749 oidcpy(&oid, &oe->idx.oid);
2750 } else if (!get_oid(from, &oid)) {
2751 struct object_entry *oe = find_object(&oid);
2752 if (!oe) {
2753 type = oid_object_info(the_repository, &oid, NULL);
2754 if (type < 0)
2755 die("Not a valid object: %s", from);
2756 } else
2757 type = oe->type;
2758 } else
2759 die("Invalid ref name or SHA1 expression: %s", from);
2760 read_next_command();
2762 /* original-oid ... */
2763 parse_original_identifier();
2765 /* tagger ... */
2766 if (skip_prefix(command_buf.buf, "tagger ", &v)) {
2767 tagger = parse_ident(v);
2768 read_next_command();
2769 } else
2770 tagger = NULL;
2772 /* tag payload/message */
2773 parse_data(&msg, 0, NULL);
2775 /* build the tag object */
2776 strbuf_reset(&new_data);
2778 strbuf_addf(&new_data,
2779 "object %s\n"
2780 "type %s\n"
2781 "tag %s\n",
2782 oid_to_hex(&oid), type_name(type), t->name);
2783 if (tagger)
2784 strbuf_addf(&new_data,
2785 "tagger %s\n", tagger);
2786 strbuf_addch(&new_data, '\n');
2787 strbuf_addbuf(&new_data, &msg);
2788 free(tagger);
2790 if (store_object(OBJ_TAG, &new_data, NULL, &t->oid, next_mark))
2791 t->pack_id = MAX_PACK_ID;
2792 else
2793 t->pack_id = pack_id;
2796 static void parse_reset_branch(const char *arg)
2798 struct branch *b;
2799 const char *tag_name;
2801 b = lookup_branch(arg);
2802 if (b) {
2803 oidclr(&b->oid);
2804 oidclr(&b->branch_tree.versions[0].oid);
2805 oidclr(&b->branch_tree.versions[1].oid);
2806 if (b->branch_tree.tree) {
2807 release_tree_content_recursive(b->branch_tree.tree);
2808 b->branch_tree.tree = NULL;
2811 else
2812 b = new_branch(arg);
2813 read_next_command();
2814 parse_from(b);
2815 if (b->delete && skip_prefix(b->name, "refs/tags/", &tag_name)) {
2817 * Elsewhere, we call dump_branches() before dump_tags(),
2818 * and dump_branches() will handle ref deletions first, so
2819 * in order to make sure the deletion actually takes effect,
2820 * we need to remove the tag from our list of tags to update.
2822 * NEEDSWORK: replace list of tags with hashmap for faster
2823 * deletion?
2825 struct tag *t, *prev = NULL;
2826 for (t = first_tag; t; t = t->next_tag) {
2827 if (!strcmp(t->name, tag_name))
2828 break;
2829 prev = t;
2831 if (t) {
2832 if (prev)
2833 prev->next_tag = t->next_tag;
2834 else
2835 first_tag = t->next_tag;
2836 if (!t->next_tag)
2837 last_tag = prev;
2838 /* There is no mem_pool_free(t) function to call. */
2841 if (command_buf.len > 0)
2842 unread_command_buf = 1;
2845 static void cat_blob_write(const char *buf, unsigned long size)
2847 if (write_in_full(cat_blob_fd, buf, size) < 0)
2848 die_errno("Write to frontend failed");
2851 static void cat_blob(struct object_entry *oe, struct object_id *oid)
2853 struct strbuf line = STRBUF_INIT;
2854 unsigned long size;
2855 enum object_type type = 0;
2856 char *buf;
2858 if (!oe || oe->pack_id == MAX_PACK_ID) {
2859 buf = read_object_file(oid, &type, &size);
2860 } else {
2861 type = oe->type;
2862 buf = gfi_unpack_entry(oe, &size);
2866 * Output based on batch_one_object() from cat-file.c.
2868 if (type <= 0) {
2869 strbuf_reset(&line);
2870 strbuf_addf(&line, "%s missing\n", oid_to_hex(oid));
2871 cat_blob_write(line.buf, line.len);
2872 strbuf_release(&line);
2873 free(buf);
2874 return;
2876 if (!buf)
2877 die("Can't read object %s", oid_to_hex(oid));
2878 if (type != OBJ_BLOB)
2879 die("Object %s is a %s but a blob was expected.",
2880 oid_to_hex(oid), type_name(type));
2881 strbuf_reset(&line);
2882 strbuf_addf(&line, "%s %s %"PRIuMAX"\n", oid_to_hex(oid),
2883 type_name(type), (uintmax_t)size);
2884 cat_blob_write(line.buf, line.len);
2885 strbuf_release(&line);
2886 cat_blob_write(buf, size);
2887 cat_blob_write("\n", 1);
2888 if (oe && oe->pack_id == pack_id) {
2889 last_blob.offset = oe->idx.offset;
2890 strbuf_attach(&last_blob.data, buf, size, size);
2891 last_blob.depth = oe->depth;
2892 } else
2893 free(buf);
2896 static void parse_get_mark(const char *p)
2898 struct object_entry *oe;
2899 char output[GIT_MAX_HEXSZ + 2];
2901 /* get-mark SP <object> LF */
2902 if (*p != ':')
2903 die("Not a mark: %s", p);
2905 oe = find_mark(parse_mark_ref_eol(p));
2906 if (!oe)
2907 die("Unknown mark: %s", command_buf.buf);
2909 xsnprintf(output, sizeof(output), "%s\n", oid_to_hex(&oe->idx.oid));
2910 cat_blob_write(output, the_hash_algo->hexsz + 1);
2913 static void parse_cat_blob(const char *p)
2915 struct object_entry *oe;
2916 struct object_id oid;
2918 /* cat-blob SP <object> LF */
2919 if (*p == ':') {
2920 oe = find_mark(parse_mark_ref_eol(p));
2921 if (!oe)
2922 die("Unknown mark: %s", command_buf.buf);
2923 oidcpy(&oid, &oe->idx.oid);
2924 } else {
2925 if (parse_oid_hex(p, &oid, &p))
2926 die("Invalid dataref: %s", command_buf.buf);
2927 if (*p)
2928 die("Garbage after SHA1: %s", command_buf.buf);
2929 oe = find_object(&oid);
2932 cat_blob(oe, &oid);
2935 static struct object_entry *dereference(struct object_entry *oe,
2936 struct object_id *oid)
2938 unsigned long size;
2939 char *buf = NULL;
2940 const unsigned hexsz = the_hash_algo->hexsz;
2942 if (!oe) {
2943 enum object_type type = oid_object_info(the_repository, oid,
2944 NULL);
2945 if (type < 0)
2946 die("object not found: %s", oid_to_hex(oid));
2947 /* cache it! */
2948 oe = insert_object(oid);
2949 oe->type = type;
2950 oe->pack_id = MAX_PACK_ID;
2951 oe->idx.offset = 1;
2953 switch (oe->type) {
2954 case OBJ_TREE: /* easy case. */
2955 return oe;
2956 case OBJ_COMMIT:
2957 case OBJ_TAG:
2958 break;
2959 default:
2960 die("Not a tree-ish: %s", command_buf.buf);
2963 if (oe->pack_id != MAX_PACK_ID) { /* in a pack being written */
2964 buf = gfi_unpack_entry(oe, &size);
2965 } else {
2966 enum object_type unused;
2967 buf = read_object_file(oid, &unused, &size);
2969 if (!buf)
2970 die("Can't load object %s", oid_to_hex(oid));
2972 /* Peel one layer. */
2973 switch (oe->type) {
2974 case OBJ_TAG:
2975 if (size < hexsz + strlen("object ") ||
2976 get_oid_hex(buf + strlen("object "), oid))
2977 die("Invalid SHA1 in tag: %s", command_buf.buf);
2978 break;
2979 case OBJ_COMMIT:
2980 if (size < hexsz + strlen("tree ") ||
2981 get_oid_hex(buf + strlen("tree "), oid))
2982 die("Invalid SHA1 in commit: %s", command_buf.buf);
2985 free(buf);
2986 return find_object(oid);
2989 static struct object_entry *parse_treeish_dataref(const char **p)
2991 struct object_id oid;
2992 struct object_entry *e;
2994 if (**p == ':') { /* <mark> */
2995 e = find_mark(parse_mark_ref_space(p));
2996 if (!e)
2997 die("Unknown mark: %s", command_buf.buf);
2998 oidcpy(&oid, &e->idx.oid);
2999 } else { /* <sha1> */
3000 if (parse_oid_hex(*p, &oid, p))
3001 die("Invalid dataref: %s", command_buf.buf);
3002 e = find_object(&oid);
3003 if (*(*p)++ != ' ')
3004 die("Missing space after tree-ish: %s", command_buf.buf);
3007 while (!e || e->type != OBJ_TREE)
3008 e = dereference(e, &oid);
3009 return e;
3012 static void print_ls(int mode, const unsigned char *hash, const char *path)
3014 static struct strbuf line = STRBUF_INIT;
3016 /* See show_tree(). */
3017 const char *type =
3018 S_ISGITLINK(mode) ? commit_type :
3019 S_ISDIR(mode) ? tree_type :
3020 blob_type;
3022 if (!mode) {
3023 /* missing SP path LF */
3024 strbuf_reset(&line);
3025 strbuf_addstr(&line, "missing ");
3026 quote_c_style(path, &line, NULL, 0);
3027 strbuf_addch(&line, '\n');
3028 } else {
3029 /* mode SP type SP object_name TAB path LF */
3030 strbuf_reset(&line);
3031 strbuf_addf(&line, "%06o %s %s\t",
3032 mode & ~NO_DELTA, type, hash_to_hex(hash));
3033 quote_c_style(path, &line, NULL, 0);
3034 strbuf_addch(&line, '\n');
3036 cat_blob_write(line.buf, line.len);
3039 static void parse_ls(const char *p, struct branch *b)
3041 struct tree_entry *root = NULL;
3042 struct tree_entry leaf = {NULL};
3044 /* ls SP (<tree-ish> SP)? <path> */
3045 if (*p == '"') {
3046 if (!b)
3047 die("Not in a commit: %s", command_buf.buf);
3048 root = &b->branch_tree;
3049 } else {
3050 struct object_entry *e = parse_treeish_dataref(&p);
3051 root = new_tree_entry();
3052 oidcpy(&root->versions[1].oid, &e->idx.oid);
3053 if (!is_null_oid(&root->versions[1].oid))
3054 root->versions[1].mode = S_IFDIR;
3055 load_tree(root);
3057 if (*p == '"') {
3058 static struct strbuf uq = STRBUF_INIT;
3059 const char *endp;
3060 strbuf_reset(&uq);
3061 if (unquote_c_style(&uq, p, &endp))
3062 die("Invalid path: %s", command_buf.buf);
3063 if (*endp)
3064 die("Garbage after path in: %s", command_buf.buf);
3065 p = uq.buf;
3067 tree_content_get(root, p, &leaf, 1);
3069 * A directory in preparation would have a sha1 of zero
3070 * until it is saved. Save, for simplicity.
3072 if (S_ISDIR(leaf.versions[1].mode))
3073 store_tree(&leaf);
3075 print_ls(leaf.versions[1].mode, leaf.versions[1].oid.hash, p);
3076 if (leaf.tree)
3077 release_tree_content_recursive(leaf.tree);
3078 if (!b || root != &b->branch_tree)
3079 release_tree_entry(root);
3082 static void checkpoint(void)
3084 checkpoint_requested = 0;
3085 if (object_count) {
3086 cycle_packfile();
3088 dump_branches();
3089 dump_tags();
3090 dump_marks();
3093 static void parse_checkpoint(void)
3095 checkpoint_requested = 1;
3096 skip_optional_lf();
3099 static void parse_progress(void)
3101 fwrite(command_buf.buf, 1, command_buf.len, stdout);
3102 fputc('\n', stdout);
3103 fflush(stdout);
3104 skip_optional_lf();
3107 static void parse_alias(void)
3109 struct object_entry *e;
3110 struct branch b;
3112 skip_optional_lf();
3113 read_next_command();
3115 /* mark ... */
3116 parse_mark();
3117 if (!next_mark)
3118 die(_("Expected 'mark' command, got %s"), command_buf.buf);
3120 /* to ... */
3121 memset(&b, 0, sizeof(b));
3122 if (!parse_objectish_with_prefix(&b, "to "))
3123 die(_("Expected 'to' command, got %s"), command_buf.buf);
3124 e = find_object(&b.oid);
3125 assert(e);
3126 insert_mark(next_mark, e);
3129 static char* make_fast_import_path(const char *path)
3131 if (!relative_marks_paths || is_absolute_path(path))
3132 return xstrdup(path);
3133 return git_pathdup("info/fast-import/%s", path);
3136 static void option_import_marks(const char *marks,
3137 int from_stream, int ignore_missing)
3139 if (import_marks_file) {
3140 if (from_stream)
3141 die("Only one import-marks command allowed per stream");
3143 /* read previous mark file */
3144 if(!import_marks_file_from_stream)
3145 read_marks();
3148 import_marks_file = make_fast_import_path(marks);
3149 safe_create_leading_directories_const(import_marks_file);
3150 import_marks_file_from_stream = from_stream;
3151 import_marks_file_ignore_missing = ignore_missing;
3154 static void option_date_format(const char *fmt)
3156 if (!strcmp(fmt, "raw"))
3157 whenspec = WHENSPEC_RAW;
3158 else if (!strcmp(fmt, "rfc2822"))
3159 whenspec = WHENSPEC_RFC2822;
3160 else if (!strcmp(fmt, "now"))
3161 whenspec = WHENSPEC_NOW;
3162 else
3163 die("unknown --date-format argument %s", fmt);
3166 static unsigned long ulong_arg(const char *option, const char *arg)
3168 char *endptr;
3169 unsigned long rv = strtoul(arg, &endptr, 0);
3170 if (strchr(arg, '-') || endptr == arg || *endptr)
3171 die("%s: argument must be a non-negative integer", option);
3172 return rv;
3175 static void option_depth(const char *depth)
3177 max_depth = ulong_arg("--depth", depth);
3178 if (max_depth > MAX_DEPTH)
3179 die("--depth cannot exceed %u", MAX_DEPTH);
3182 static void option_active_branches(const char *branches)
3184 max_active_branches = ulong_arg("--active-branches", branches);
3187 static void option_export_marks(const char *marks)
3189 export_marks_file = make_fast_import_path(marks);
3190 safe_create_leading_directories_const(export_marks_file);
3193 static void option_cat_blob_fd(const char *fd)
3195 unsigned long n = ulong_arg("--cat-blob-fd", fd);
3196 if (n > (unsigned long) INT_MAX)
3197 die("--cat-blob-fd cannot exceed %d", INT_MAX);
3198 cat_blob_fd = (int) n;
3201 static void option_export_pack_edges(const char *edges)
3203 if (pack_edges)
3204 fclose(pack_edges);
3205 pack_edges = xfopen(edges, "a");
3208 static int parse_one_option(const char *option)
3210 if (skip_prefix(option, "max-pack-size=", &option)) {
3211 unsigned long v;
3212 if (!git_parse_ulong(option, &v))
3213 return 0;
3214 if (v < 8192) {
3215 warning("max-pack-size is now in bytes, assuming --max-pack-size=%lum", v);
3216 v *= 1024 * 1024;
3217 } else if (v < 1024 * 1024) {
3218 warning("minimum max-pack-size is 1 MiB");
3219 v = 1024 * 1024;
3221 max_packsize = v;
3222 } else if (skip_prefix(option, "big-file-threshold=", &option)) {
3223 unsigned long v;
3224 if (!git_parse_ulong(option, &v))
3225 return 0;
3226 big_file_threshold = v;
3227 } else if (skip_prefix(option, "depth=", &option)) {
3228 option_depth(option);
3229 } else if (skip_prefix(option, "active-branches=", &option)) {
3230 option_active_branches(option);
3231 } else if (skip_prefix(option, "export-pack-edges=", &option)) {
3232 option_export_pack_edges(option);
3233 } else if (starts_with(option, "quiet")) {
3234 show_stats = 0;
3235 } else if (starts_with(option, "stats")) {
3236 show_stats = 1;
3237 } else {
3238 return 0;
3241 return 1;
3244 static int parse_one_feature(const char *feature, int from_stream)
3246 const char *arg;
3248 if (skip_prefix(feature, "date-format=", &arg)) {
3249 option_date_format(arg);
3250 } else if (skip_prefix(feature, "import-marks=", &arg)) {
3251 option_import_marks(arg, from_stream, 0);
3252 } else if (skip_prefix(feature, "import-marks-if-exists=", &arg)) {
3253 option_import_marks(arg, from_stream, 1);
3254 } else if (skip_prefix(feature, "export-marks=", &arg)) {
3255 option_export_marks(arg);
3256 } else if (!strcmp(feature, "alias")) {
3257 ; /* Don't die - this feature is supported */
3258 } else if (!strcmp(feature, "get-mark")) {
3259 ; /* Don't die - this feature is supported */
3260 } else if (!strcmp(feature, "cat-blob")) {
3261 ; /* Don't die - this feature is supported */
3262 } else if (!strcmp(feature, "relative-marks")) {
3263 relative_marks_paths = 1;
3264 } else if (!strcmp(feature, "no-relative-marks")) {
3265 relative_marks_paths = 0;
3266 } else if (!strcmp(feature, "done")) {
3267 require_explicit_termination = 1;
3268 } else if (!strcmp(feature, "force")) {
3269 force_update = 1;
3270 } else if (!strcmp(feature, "notes") || !strcmp(feature, "ls")) {
3271 ; /* do nothing; we have the feature */
3272 } else {
3273 return 0;
3276 return 1;
3279 static void parse_feature(const char *feature)
3281 if (seen_data_command)
3282 die("Got feature command '%s' after data command", feature);
3284 if (parse_one_feature(feature, 1))
3285 return;
3287 die("This version of fast-import does not support feature %s.", feature);
3290 static void parse_option(const char *option)
3292 if (seen_data_command)
3293 die("Got option command '%s' after data command", option);
3295 if (parse_one_option(option))
3296 return;
3298 die("This version of fast-import does not support option: %s", option);
3301 static void git_pack_config(void)
3303 int indexversion_value;
3304 int limit;
3305 unsigned long packsizelimit_value;
3307 if (!git_config_get_ulong("pack.depth", &max_depth)) {
3308 if (max_depth > MAX_DEPTH)
3309 max_depth = MAX_DEPTH;
3311 if (!git_config_get_int("pack.indexversion", &indexversion_value)) {
3312 pack_idx_opts.version = indexversion_value;
3313 if (pack_idx_opts.version > 2)
3314 git_die_config("pack.indexversion",
3315 "bad pack.indexversion=%"PRIu32, pack_idx_opts.version);
3317 if (!git_config_get_ulong("pack.packsizelimit", &packsizelimit_value))
3318 max_packsize = packsizelimit_value;
3320 if (!git_config_get_int("fastimport.unpacklimit", &limit))
3321 unpack_limit = limit;
3322 else if (!git_config_get_int("transfer.unpacklimit", &limit))
3323 unpack_limit = limit;
3325 git_config(git_default_config, NULL);
3328 static const char fast_import_usage[] =
3329 "git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]";
3331 static void parse_argv(void)
3333 unsigned int i;
3335 for (i = 1; i < global_argc; i++) {
3336 const char *a = global_argv[i];
3338 if (*a != '-' || !strcmp(a, "--"))
3339 break;
3341 if (!skip_prefix(a, "--", &a))
3342 die("unknown option %s", a);
3344 if (parse_one_option(a))
3345 continue;
3347 if (parse_one_feature(a, 0))
3348 continue;
3350 if (skip_prefix(a, "cat-blob-fd=", &a)) {
3351 option_cat_blob_fd(a);
3352 continue;
3355 die("unknown option --%s", a);
3357 if (i != global_argc)
3358 usage(fast_import_usage);
3360 seen_data_command = 1;
3361 if (import_marks_file)
3362 read_marks();
3365 int cmd_main(int argc, const char **argv)
3367 unsigned int i;
3369 if (argc == 2 && !strcmp(argv[1], "-h"))
3370 usage(fast_import_usage);
3372 setup_git_directory();
3373 reset_pack_idx_option(&pack_idx_opts);
3374 git_pack_config();
3376 alloc_objects(object_entry_alloc);
3377 strbuf_init(&command_buf, 0);
3378 atom_table = xcalloc(atom_table_sz, sizeof(struct atom_str*));
3379 branch_table = xcalloc(branch_table_sz, sizeof(struct branch*));
3380 avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*));
3381 marks = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct mark_set));
3383 global_argc = argc;
3384 global_argv = argv;
3386 rc_free = mem_pool_alloc(&fi_mem_pool, cmd_save * sizeof(*rc_free));
3387 for (i = 0; i < (cmd_save - 1); i++)
3388 rc_free[i].next = &rc_free[i + 1];
3389 rc_free[cmd_save - 1].next = NULL;
3391 start_packfile();
3392 set_die_routine(die_nicely);
3393 set_checkpoint_signal();
3394 while (read_next_command() != EOF) {
3395 const char *v;
3396 if (!strcmp("blob", command_buf.buf))
3397 parse_new_blob();
3398 else if (skip_prefix(command_buf.buf, "commit ", &v))
3399 parse_new_commit(v);
3400 else if (skip_prefix(command_buf.buf, "tag ", &v))
3401 parse_new_tag(v);
3402 else if (skip_prefix(command_buf.buf, "reset ", &v))
3403 parse_reset_branch(v);
3404 else if (skip_prefix(command_buf.buf, "ls ", &v))
3405 parse_ls(v, NULL);
3406 else if (skip_prefix(command_buf.buf, "cat-blob ", &v))
3407 parse_cat_blob(v);
3408 else if (skip_prefix(command_buf.buf, "get-mark ", &v))
3409 parse_get_mark(v);
3410 else if (!strcmp("checkpoint", command_buf.buf))
3411 parse_checkpoint();
3412 else if (!strcmp("done", command_buf.buf))
3413 break;
3414 else if (!strcmp("alias", command_buf.buf))
3415 parse_alias();
3416 else if (starts_with(command_buf.buf, "progress "))
3417 parse_progress();
3418 else if (skip_prefix(command_buf.buf, "feature ", &v))
3419 parse_feature(v);
3420 else if (skip_prefix(command_buf.buf, "option git ", &v))
3421 parse_option(v);
3422 else if (starts_with(command_buf.buf, "option "))
3423 /* ignore non-git options*/;
3424 else
3425 die("Unsupported command: %s", command_buf.buf);
3427 if (checkpoint_requested)
3428 checkpoint();
3431 /* argv hasn't been parsed yet, do so */
3432 if (!seen_data_command)
3433 parse_argv();
3435 if (require_explicit_termination && feof(stdin))
3436 die("stream ends early");
3438 end_packfile();
3440 dump_branches();
3441 dump_tags();
3442 unkeep_all_packs();
3443 dump_marks();
3445 if (pack_edges)
3446 fclose(pack_edges);
3448 if (show_stats) {
3449 uintmax_t total_count = 0, duplicate_count = 0;
3450 for (i = 0; i < ARRAY_SIZE(object_count_by_type); i++)
3451 total_count += object_count_by_type[i];
3452 for (i = 0; i < ARRAY_SIZE(duplicate_count_by_type); i++)
3453 duplicate_count += duplicate_count_by_type[i];
3455 fprintf(stderr, "%s statistics:\n", argv[0]);
3456 fprintf(stderr, "---------------------------------------------------------------------\n");
3457 fprintf(stderr, "Alloc'd objects: %10" PRIuMAX "\n", alloc_count);
3458 fprintf(stderr, "Total objects: %10" PRIuMAX " (%10" PRIuMAX " duplicates )\n", total_count, duplicate_count);
3459 fprintf(stderr, " blobs : %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas of %10" PRIuMAX" attempts)\n", object_count_by_type[OBJ_BLOB], duplicate_count_by_type[OBJ_BLOB], delta_count_by_type[OBJ_BLOB], delta_count_attempts_by_type[OBJ_BLOB]);
3460 fprintf(stderr, " trees : %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas of %10" PRIuMAX" attempts)\n", object_count_by_type[OBJ_TREE], duplicate_count_by_type[OBJ_TREE], delta_count_by_type[OBJ_TREE], delta_count_attempts_by_type[OBJ_TREE]);
3461 fprintf(stderr, " commits: %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas of %10" PRIuMAX" attempts)\n", object_count_by_type[OBJ_COMMIT], duplicate_count_by_type[OBJ_COMMIT], delta_count_by_type[OBJ_COMMIT], delta_count_attempts_by_type[OBJ_COMMIT]);
3462 fprintf(stderr, " tags : %10" PRIuMAX " (%10" PRIuMAX " duplicates %10" PRIuMAX " deltas of %10" PRIuMAX" attempts)\n", object_count_by_type[OBJ_TAG], duplicate_count_by_type[OBJ_TAG], delta_count_by_type[OBJ_TAG], delta_count_attempts_by_type[OBJ_TAG]);
3463 fprintf(stderr, "Total branches: %10lu (%10lu loads )\n", branch_count, branch_load_count);
3464 fprintf(stderr, " marks: %10" PRIuMAX " (%10" PRIuMAX " unique )\n", (((uintmax_t)1) << marks->shift) * 1024, marks_set_count);
3465 fprintf(stderr, " atoms: %10u\n", atom_cnt);
3466 fprintf(stderr, "Memory total: %10" PRIuMAX " KiB\n", (tree_entry_allocd + fi_mem_pool.pool_alloc + alloc_count*sizeof(struct object_entry))/1024);
3467 fprintf(stderr, " pools: %10lu KiB\n", (unsigned long)((tree_entry_allocd + fi_mem_pool.pool_alloc) /1024));
3468 fprintf(stderr, " objects: %10" PRIuMAX " KiB\n", (alloc_count*sizeof(struct object_entry))/1024);
3469 fprintf(stderr, "---------------------------------------------------------------------\n");
3470 pack_report();
3471 fprintf(stderr, "---------------------------------------------------------------------\n");
3472 fprintf(stderr, "\n");
3475 return failure ? 1 : 0;