@matheusbsbs / matheus-bagliano / commits / 06a45c8cc9
Fork 0

Improve the readability of git-pack-redundant

Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>

Lukas Sandström committed Nov 18, 2005 at 23:00 UTC 06a45c8cc9fdd271903eb51d712ca9820a0cd799
1 file changed +24 -13
pack-redundant.c
+24 -13
@@ -497,7 +497,7 @@ void load_all_objects()
497 }
498
499 /* this scales like O(n^2) */
500 -void cmp_packs()
500 +void cmp_local_packs()
501 {
502 struct pack_list *subset, *pl = local_packs;
503
@@ -506,16 +506,21 @@ void cmp_packs()
506 cmp_two_packs(pl, subset);
507 pl = pl->next;
508 }
509 +}
510
510 - pl = altodb_packs;
511 - while (pl) {
512 - subset = local_packs;
513 - while (subset) {
514 - llist_sorted_difference_inplace(subset->unique_objects,
515 - pl->all_objects);
516 - subset = subset->next;
511 +void scan_alt_odb_packs()
512 +{
513 + struct pack_list *local, *alt;
514 +
515 + alt = altodb_packs;
516 + while (alt) {
517 + local = local_packs;
518 + while (local) {
519 + llist_sorted_difference_inplace(local->unique_objects,
520 + alt->all_objects);
521 + local = local->next;
522 }
518 - pl = pl->next;
523 + alt = alt->next;
524 }
525 }
526
@@ -525,6 +530,9 @@ struct pack_list * add_pack(struct packed_git *p)
530 size_t off;
531 void *base;
532
533 + if (!p->pack_local && !(alt_odb || verbose))
534 + return NULL;
535 +
536 l.pack = p;
537 llist_init(&l.all_objects);
538
@@ -532,14 +540,14 @@ struct pack_list * add_pack(struct packed_git *p)
540 base = (void *)p->index_base;
541 while (off <= p->index_size - 3 * 20) {
542 llist_insert_back(l.all_objects, base + off);
535 - off+=24;
543 + off += 24;
544 }
545 /* this list will be pruned in cmp_two_packs later */
546 l.unique_objects = llist_copy(l.all_objects);
547 if (p->pack_local)
548 return pack_list_insert(&local_packs, &l);
549 else
542 - return alt_odb ? pack_list_insert(&altodb_packs, &l) : NULL;
550 + return pack_list_insert(&altodb_packs, &l);
551 }
552
553 struct pack_list * add_pack_file(char *filename)
@@ -607,11 +615,14 @@ int main(int argc, char **argv)
615 if (local_packs == NULL)
616 die("Zero packs found!\n");
617
610 - cmp_packs();
611 -
618 load_all_objects();
619
620 + cmp_local_packs();
621 + if (alt_odb)
622 + scan_alt_odb_packs();
623 +
624 minimize(&min);
625 +
626 if (verbose) {
627 fprintf(stderr, "There are %lu packs available in alt-odbs.\n",
628 (unsigned long)pack_list_size(altodb_packs));