← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Merge bzr.dev into cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1229
1229
                parent_id_winner = "other"
1230
1230
        if name_winner == "this" and parent_id_winner == "this":
1231
1231
            return
1232
 
        if name_winner == "conflict":
1233
 
            trans_id = self.tt.trans_id_file_id(file_id)
1234
 
            self._raw_conflicts.append(('name conflict', trans_id,
1235
 
                                        this_name, other_name))
1236
 
        if parent_id_winner == "conflict":
1237
 
            trans_id = self.tt.trans_id_file_id(file_id)
1238
 
            self._raw_conflicts.append(('parent conflict', trans_id,
1239
 
                                        this_parent, other_parent))
 
1232
        if name_winner == 'conflict' or parent_id_winner == 'conflict':
 
1233
            # Creating helpers (.OTHER or .THIS) here cause problems down the
 
1234
            # road if a ContentConflict needs to be created so we should not do
 
1235
            # that
 
1236
            trans_id = self.tt.trans_id_file_id(file_id)
 
1237
            self._raw_conflicts.append(('path conflict', trans_id, file_id,
 
1238
                                        this_parent, this_name,
 
1239
                                        other_parent, other_name))
1240
1240
        if other_name is None:
1241
1241
            # it doesn't matter whether the result was 'other' or
1242
1242
            # 'conflict'-- if there's no 'other', we leave it alone.
1243
1243
            return
1244
 
        # if we get here, name_winner and parent_winner are set to safe values.
1245
 
        trans_id = self.tt.trans_id_file_id(file_id)
1246
1244
        parent_id = parents[self.winner_idx[parent_id_winner]]
1247
1245
        if parent_id is not None:
1248
 
            parent_trans_id = self.tt.trans_id_file_id(parent_id)
 
1246
            # if we get here, name_winner and parent_winner are set to safe
 
1247
            # values.
1249
1248
            self.tt.adjust_path(names[self.winner_idx[name_winner]],
1250
 
                                parent_trans_id, trans_id)
 
1249
                                self.tt.trans_id_file_id(parent_id),
 
1250
                                self.tt.trans_id_file_id(file_id))
1251
1251
 
1252
1252
    def _do_merge_contents(self, file_id):
1253
1253
        """Performs a merge on file_id contents."""
1532
1532
 
1533
1533
    def cook_conflicts(self, fs_conflicts):
1534
1534
        """Convert all conflicts into a form that doesn't depend on trans_id"""
1535
 
        name_conflicts = {}
1536
1535
        self.cooked_conflicts.extend(transform.cook_conflicts(
1537
1536
                fs_conflicts, self.tt))
1538
1537
        fp = transform.FinalPaths(self.tt)
1539
1538
        for conflict in self._raw_conflicts:
1540
1539
            conflict_type = conflict[0]
1541
 
            if conflict_type in ('name conflict', 'parent conflict'):
1542
 
                trans_id = conflict[1]
1543
 
                conflict_args = conflict[2:]
1544
 
                if trans_id not in name_conflicts:
1545
 
                    name_conflicts[trans_id] = {}
1546
 
                transform.unique_add(name_conflicts[trans_id], conflict_type,
1547
 
                                     conflict_args)
1548
 
            if conflict_type == 'contents conflict':
 
1540
            if conflict_type == 'path conflict':
 
1541
                (trans_id, file_id,
 
1542
                this_parent, this_name,
 
1543
                other_parent, other_name) = conflict[1:]
 
1544
                if this_parent is None or this_name is None:
 
1545
                    this_path = '<deleted>'
 
1546
                else:
 
1547
                    parent_path =  fp.get_path(
 
1548
                        self.tt.trans_id_file_id(this_parent))
 
1549
                    this_path = osutils.pathjoin(parent_path, this_name)
 
1550
                if other_parent is None or other_name is None:
 
1551
                    other_path = '<deleted>'
 
1552
                else:
 
1553
                    parent_path =  fp.get_path(
 
1554
                        self.tt.trans_id_file_id(other_parent))
 
1555
                    other_path = osutils.pathjoin(parent_path, other_name)
 
1556
                c = _mod_conflicts.Conflict.factory(
 
1557
                    'path conflict', path=this_path,
 
1558
                    conflict_path=other_path,
 
1559
                    file_id=file_id)
 
1560
            elif conflict_type == 'contents conflict':
1549
1561
                for trans_id in conflict[1]:
1550
1562
                    file_id = self.tt.final_file_id(trans_id)
1551
1563
                    if file_id is not None:
1557
1569
                        break
1558
1570
                c = _mod_conflicts.Conflict.factory(conflict_type,
1559
1571
                                                    path=path, file_id=file_id)
1560
 
                self.cooked_conflicts.append(c)
1561
 
            if conflict_type == 'text conflict':
 
1572
            elif conflict_type == 'text conflict':
1562
1573
                trans_id = conflict[1]
1563
1574
                path = fp.get_path(trans_id)
1564
1575
                file_id = self.tt.final_file_id(trans_id)
1565
1576
                c = _mod_conflicts.Conflict.factory(conflict_type,
1566
1577
                                                    path=path, file_id=file_id)
1567
 
                self.cooked_conflicts.append(c)
1568
 
 
1569
 
        for trans_id, conflicts in name_conflicts.iteritems():
1570
 
            try:
1571
 
                this_parent, other_parent = conflicts['parent conflict']
1572
 
                if this_parent == other_parent:
1573
 
                    raise AssertionError()
1574
 
            except KeyError:
1575
 
                this_parent = other_parent = \
1576
 
                    self.tt.final_file_id(self.tt.final_parent(trans_id))
1577
 
            try:
1578
 
                this_name, other_name = conflicts['name conflict']
1579
 
                if this_name == other_name:
1580
 
                    raise AssertionError()
1581
 
            except KeyError:
1582
 
                this_name = other_name = self.tt.final_name(trans_id)
1583
 
            other_path = fp.get_path(trans_id)
1584
 
            if this_parent is not None and this_name is not None:
1585
 
                this_parent_path = \
1586
 
                    fp.get_path(self.tt.trans_id_file_id(this_parent))
1587
 
                this_path = osutils.pathjoin(this_parent_path, this_name)
1588
1578
            else:
1589
 
                this_path = "<deleted>"
1590
 
            file_id = self.tt.final_file_id(trans_id)
1591
 
            c = _mod_conflicts.Conflict.factory('path conflict', path=this_path,
1592
 
                                                conflict_path=other_path,
1593
 
                                                file_id=file_id)
 
1579
                raise AssertionError('bad conflict type: %r' % (conflict,))
1594
1580
            self.cooked_conflicts.append(c)
1595
1581
        self.cooked_conflicts.sort(key=_mod_conflicts.Conflict.sort_key)
1596
1582