← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge3.py

  • Committer: Martin Pool
  • Date: 2008-05-08 04:12:06 UTC
  • mto: This revision was merged to the branch mainline in revision 3415.
  • Revision ID: mbp@sourcefrog.net-20080508041206-tkrr8ucmcyrlzkum
Some review cleanups for assertion removal

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge3.py
36
36
    >>> intersect((0, 9), (7, 15))
37
37
    (7, 9)
38
38
    """
39
 
    # preconditions: (ra[0] <= ra[1]) and (rb[0] <= rb[1])
40
 
    
41
39
    sa = max(ra[0], rb[0])
42
40
    sb = min(ra[1], rb[1])
43
41
    if sa < sb:
222
220
        
223
221
        for zmatch, zend, amatch, aend, bmatch, bend in self.find_sync_regions():
224
222
            matchlen = zend - zmatch
225
 
            # invariants:
226
 
            #   matchlen >= 0
227
 
            #   matchlen == (aend - amatch)
228
 
            #   matchlen == (bend - bmatch)
229
223
            len_a = amatch - ia
230
224
            len_b = bmatch - ib
231
225
            len_base = zmatch - iz
232
 
            # invariants:
233
 
            # assert len_a >= 0
234
 
            # assert len_b >= 0
235
 
            # assert len_base >= 0
236
 
 
237
226
            #print 'unmatched a=%d, b=%d' % (len_a, len_b)
238
227
 
239
228
            if len_a or len_b:
271
260
            # that's OK, we can just skip it.
272
261
 
273
262
            if matchlen > 0:
274
 
                # invariants:
275
 
                # assert ia == amatch
276
 
                # assert ib == bmatch
277
 
                # assert iz == zmatch
278
 
                
279
263
                yield 'unchanged', zmatch, zend
280
264
                iz = zend
281
265
                ia = aend
385
369
                intbase = i[0]
386
370
                intend = i[1]
387
371
                intlen = intend - intbase
388
 
 
389
 
                # found a match of base[i[0], i[1]]; this may be less than
390
 
                # the region that matches in either one
391
 
                # assert intlen <= alen
392
 
                # assert intlen <= blen
393
 
                # assert abase <= intbase
394
 
                # assert bbase <= intbase
395
 
 
396
372
                asub = amatch + (intbase - abase)
397
373
                bsub = bmatch + (intbase - bbase)
398
374
                aend = asub + intlen
399
375
                bend = bsub + intlen
400
 
 
401
 
                # assert self.base[intbase:intend] == self.a[asub:aend], \
402
 
                #       (self.base[intbase:intend], self.a[asub:aend])
403
 
                # assert self.base[intbase:intend] == self.b[bsub:bend]
404
 
 
405
376
                sl.append((intbase, intend,
406
377
                           asub, aend,
407
378
                           bsub, bend))