← 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-06 22:15:52 UTC
  • mfrom: (1185.13.2)
  • mto: This revision was merged to the branch mainline in revision 1420.
  • Revision ID: robertc@robertcollins.net-20051006221552-9b15c96fa504e0ad
merge from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge3.py
19
19
# s: "i hate that."
20
20
 
21
21
 
22
 
from difflib import SequenceMatcher
23
 
from bzrlib.errors import CantReprocessAndShowBase
24
22
 
25
23
def intersect(ra, rb):
26
24
    """Given two ranges return the range where they intersect or None.
69
67
        self.base = base
70
68
        self.a = a
71
69
        self.b = b
 
70
        from difflib import SequenceMatcher
 
71
        self.a_ops = SequenceMatcher(None, base, a).get_opcodes()
 
72
        self.b_ops = SequenceMatcher(None, base, b).get_opcodes()
72
73
 
73
74
 
74
75
 
75
76
    def merge_lines(self,
76
77
                    name_a=None,
77
78
                    name_b=None,
78
 
                    name_base=None,
79
79
                    start_marker='<<<<<<<',
80
80
                    mid_marker='=======',
81
81
                    end_marker='>>>>>>>',
82
 
                    base_marker=None,
83
 
                    reprocess=False):
 
82
                    show_base=False):
84
83
        """Return merge in cvs-like form.
85
84
        """
86
 
        if base_marker and reprocess:
87
 
            raise CantReprocessAndShowBase()
88
85
        if name_a:
89
86
            start_marker = start_marker + ' ' + name_a
90
87
        if name_b:
91
88
            end_marker = end_marker + ' ' + name_b
92
 
        if name_base and base_marker:
93
 
            base_marker = base_marker + ' ' + name_base
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:
 
89
            
 
90
        for t in self.merge_regions():
98
91
            what = t[0]
99
92
            if what == 'unchanged':
100
93
                for i in range(t[1], t[2]):
109
102
                yield start_marker + '\n'
110
103
                for i in range(t[3], t[4]):
111
104
                    yield self.a[i]
112
 
                if base_marker is not None:
113
 
                    yield base_marker + '\n'
114
 
                    for i in range(t[1], t[2]):
115
 
                        yield self.base[i]
116
105
                yield mid_marker + '\n'
117
106
                for i in range(t[5], t[6]):
118
107
                    yield self.b[i]
274
263
                iz = zend
275
264
                ia = aend
276
265
                ib = bend
277
 
    
278
 
 
279
 
    def reprocess_merge_regions(self, merge_regions):
280
 
        """Where there are conflict regions, remove the agreed lines.
281
 
 
282
 
        Lines where both A and B have made the same changes are 
283
 
        eliminated.
284
 
        """
285
 
        for region in merge_regions:
286
 
            if region[0] != "conflict":
287
 
                yield region
288
 
                continue
289
 
            type, iz, zmatch, ia, amatch, ib, bmatch = region
290
 
            a_region = self.a[ia:amatch]
291
 
            b_region = self.b[ib:bmatch]
292
 
            matches = SequenceMatcher(None, a_region, 
293
 
                                      b_region).get_matching_blocks()
294
 
            next_a = ia
295
 
            next_b = ib
296
 
            for region_ia, region_ib, region_len in matches[:-1]:
297
 
                region_ia += ia
298
 
                region_ib += ib
299
 
                reg = self.mismatch_region(next_a, region_ia, next_b,
300
 
                                           region_ib)
301
 
                if reg is not None:
302
 
                    yield reg
303
 
                yield 'same', region_ia, region_len+region_ia
304
 
                next_a = region_ia + region_len
305
 
                next_b = region_ib + region_len
306
 
            reg = self.mismatch_region(next_a, amatch, next_b, bmatch)
307
 
            if reg is not None:
308
 
                yield reg
309
 
 
310
 
 
311
 
    @staticmethod
312
 
    def mismatch_region(next_a, region_ia,  next_b, region_ib):
313
 
        if next_a < region_ia or next_b < region_ib:
314
 
            return 'conflict', None, None, next_a, region_ia, next_b, region_ib
315
 
            
316
 
 
 
266
        
 
267
 
 
268
        
317
269
    def find_sync_regions(self):
318
270
        """Return a list of sync regions, where both descendents match the base.
319
271
 
320
272
        Generates a list of (base1, base2, a1, a2, b1, b2).  There is
321
273
        always a zero-length sync region at the end of all the files.
322
274
        """
 
275
        from difflib import SequenceMatcher
323
276
 
324
277
        ia = ib = 0
325
278
        amatches = SequenceMatcher(None, self.base, self.a).get_matching_blocks()
379
332
 
380
333
    def find_unconflicted(self):
381
334
        """Return a list of ranges in base that are not conflicted."""
 
335
        from difflib import SequenceMatcher
382
336
 
383
337
        import re
384
338