diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-01 22:08:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-01 22:08:12 -0800 |
| commit | b485db9896654b11c8a7bf64fd5cc3d0d8dc5b69 (patch) | |
| tree | 4b6a563b4e3dd22a1e5257bdcffac399370b096b /pack-objects.c | |
| parent | Merge branch 'ml/cvsserver' into next (diff) | |
| parent | diff-delta: allow reusing of the reference buffer index (diff) | |
| download | git-b485db9896654b11c8a7bf64fd5cc3d0d8dc5b69.tar.gz git-b485db9896654b11c8a7bf64fd5cc3d0d8dc5b69.zip | |
Merge branch 'np/delta' into next
* np/delta:
diff-delta: allow reusing of the reference buffer index
diff-delta: bound hash list length to avoid O(m*n) behavior
diff-delta: produce optimal pack data
Merge branch 'kh/svnimport'
Merge branch 'js/refs'
annotate: fix -S parameter to take a string
annotate: Add a basic set of test cases.
annotate: handle \No newline at end of file.
gitview: Use horizontal scroll bar in the tree view
Diffstat (limited to 'pack-objects.c')
| -rw-r--r-- | pack-objects.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pack-objects.c b/pack-objects.c index 136a7f5aad..d6a3463604 100644 --- a/pack-objects.c +++ b/pack-objects.c @@ -204,7 +204,7 @@ static void *delta_against(void *buf, unsigned long size, struct object_entry *e if (!otherbuf) die("unable to read %s", sha1_to_hex(entry->delta->sha1)); delta_buf = diff_delta(otherbuf, othersize, - buf, size, &delta_size, 0); + buf, size, &delta_size, 0, NULL); if (!delta_buf || delta_size != entry->delta_size) die("delta size changed"); free(buf); @@ -810,6 +810,7 @@ static int type_size_sort(const struct object_entry *a, const struct object_entr struct unpacked { struct object_entry *entry; void *data; + void **delta_index; }; /* @@ -891,7 +892,8 @@ static int try_delta(struct unpacked *cur, struct unpacked *old, unsigned max_de if (sizediff >= max_size) return -1; delta_buf = diff_delta(old->data, oldsize, - cur->data, size, &delta_size, max_size); + cur->data, size, &delta_size, + max_size, old->delta_index); if (!delta_buf) return 0; cur_entry->delta = old_entry; @@ -948,6 +950,7 @@ static void find_deltas(struct object_entry **list, int window, int depth) */ continue; + free(n->delta_index); free(n->data); n->entry = entry; n->data = read_sha1_file(entry->sha1, type, &size); @@ -974,8 +977,10 @@ static void find_deltas(struct object_entry **list, int window, int depth) if (progress) fputc('\n', stderr); - for (i = 0; i < window; ++i) + for (i = 0; i < window; ++i) { + free(array[i].delta_index); free(array[i].data); + } free(array); } |