← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff-delta.c

  • Committer: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff-delta.c
688
688
    const unsigned char *data, *buffer, *top;
689
689
    unsigned char cmd;
690
690
    struct delta_index *new_index;
691
 
    struct index_entry *entry, *entries, *old_entry;
 
691
    struct index_entry *entry, *entries;
692
692
 
693
693
    if (!src->buf || !src->size)
694
694
        return NULL;
789
789
    entry = entries;
790
790
    num_inserted = 0;
791
791
    for (; num_entries > 0; --num_entries, ++entry) {
 
792
        struct index_entry *next_bucket_entry, *cur_entry, *bucket_first_entry;
792
793
        hash_offset = (entry->val & old_index->hash_mask);
793
794
        /* The basic structure is a hash => packed_entries that fit in that
794
795
         * hash bucket. Things are structured such that the hash-pointers are
797
798
         * forward. If there are no NULL targets, then we know because
798
799
         * entry->ptr will not be NULL.
799
800
         */
800
 
        old_entry = old_index->hash[hash_offset + 1];
801
 
        old_entry--;
802
 
        while (old_entry->ptr == NULL
803
 
               && old_entry >= old_index->hash[hash_offset]) {
804
 
            old_entry--;
 
801
        // The start of the next bucket, this may point past the end of the
 
802
        // entry table if hash_offset is the last bucket.
 
803
        next_bucket_entry = old_index->hash[hash_offset + 1];
 
804
        // First entry in this bucket
 
805
        bucket_first_entry = old_index->hash[hash_offset];
 
806
        cur_entry = next_bucket_entry - 1;
 
807
        while (cur_entry->ptr == NULL && cur_entry >= bucket_first_entry) {
 
808
            cur_entry--;
805
809
        }
806
 
        old_entry++;
807
 
        if (old_entry->ptr != NULL
808
 
            || old_entry >= old_index->hash[hash_offset + 1]) {
 
810
        // cur_entry now either points at the first NULL, or it points to
 
811
        // next_bucket_entry if there were no blank spots.
 
812
        cur_entry++;
 
813
        if (cur_entry >= next_bucket_entry || cur_entry->ptr != NULL) {
809
814
            /* There is no room for this entry, we have to resize */
810
815
            // char buff[128];
811
816
            // get_text(buff, entry->ptr);
822
827
            break;
823
828
        }
824
829
        num_inserted++;
825
 
        *old_entry = *entry;
 
830
        *cur_entry = *entry;
826
831
        /* For entries which we *do* manage to insert into old_index, we don't
827
832
         * want them double copied into the final output.
828
833
         */