← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge3.py

  • Committer: Robert Collins
  • Date: 2005-10-30 00:00:09 UTC
  • mfrom: (1185.16.134)
  • Revision ID: robertc@robertcollins.net-20051030000009-9db99a338a0dfdac
Merge from Martin.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge3.py
20
20
 
21
21
 
22
22
from difflib import SequenceMatcher
 
23
from bzrlib.errors import CantReprocessAndShowBase
23
24
 
24
25
def intersect(ra, rb):
25
26
    """Given two ranges return the range where they intersect or None.
78
79
                    start_marker='<<<<<<<',
79
80
                    mid_marker='=======',
80
81
                    end_marker='>>>>>>>',
81
 
                    base_marker=None):
 
82
                    base_marker=None,
 
83
                    reprocess=False):
82
84
        """Return merge in cvs-like form.
83
85
        """
 
86
        if base_marker and reprocess:
 
87
            raise CantReprocessAndShowBase()
84
88
        if name_a:
85
89
            start_marker = start_marker + ' ' + name_a
86
90
        if name_b:
87
91
            end_marker = end_marker + ' ' + name_b
88
92
        if name_base and base_marker:
89
93
            base_marker = base_marker + ' ' + name_base
90
 
            
91
 
        for t in self.merge_regions():
 
94
        merge_regions = self.merge_regions()
 
95
        if reprocess is True:
 
96
            merge_regions = self.reprocess_merge_regions(merge_regions)
 
97
        for t in merge_regions:
92
98
            what = t[0]
93
99
            if what == 'unchanged':
94
100
                for i in range(t[1], t[2]):
268
274
                iz = zend
269
275
                ia = aend
270
276
                ib = bend
271
 
        
272
 
 
273
 
        
 
277
    
 
278
 
 
279
    def reprocess_merge_regions(self, merge_regions):
 
280
        for region in merge_regions:
 
281
            if region[0] != "conflict":
 
282
                yield region
 
283
                continue
 
284
            type, iz, zmatch, ia, amatch, ib, bmatch = region
 
285
            a_region = self.a[ia:amatch]
 
286
            b_region = self.b[ib:bmatch]
 
287
            matches = SequenceMatcher(None, a_region, 
 
288
                                      b_region).get_matching_blocks()
 
289
            next_a = ia
 
290
            next_b = ib
 
291
            for region_ia, region_ib, region_len in matches[:-1]:
 
292
                region_ia += ia
 
293
                region_ib += ib
 
294
                reg = self.mismatch_region(next_a, region_ia, next_b,
 
295
                                           region_ib)
 
296
                if reg is not None:
 
297
                    yield reg
 
298
                yield 'same', region_ia, region_len+region_ia
 
299
                next_a = region_ia + region_len
 
300
                next_b = region_ib + region_len
 
301
            reg = self.mismatch_region(next_a, amatch, next_b, bmatch)
 
302
            if reg is not None:
 
303
                yield reg
 
304
 
 
305
 
 
306
    @staticmethod
 
307
    def mismatch_region(next_a, region_ia,  next_b, region_ib):
 
308
        if next_a < region_ia or next_b < region_ib:
 
309
            return 'conflict', None, None, next_a, region_ia, next_b, region_ib
 
310
            
 
311
 
274
312
    def find_sync_regions(self):
275
313
        """Return a list of sync regions, where both descendents match the base.
276
314