← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: John Arbash Meinel
  • Date: 2006-07-07 15:22:42 UTC
  • mfrom: (1843 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1846.
  • Revision ID: john@arbash-meinel.com-20060707152242-a7b5e0afd64d9d5a
[merge] bzr.dev 1843

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1079
1079
        if hasattr(self, '_ignorelist'):
1080
1080
            return self._ignorelist
1081
1081
 
1082
 
        l = bzrlib.DEFAULT_IGNORE[:]
 
1082
        l = []
1083
1083
        if self.has_filename(bzrlib.IGNORE_FILENAME):
1084
1084
            f = self.get_file_byname(bzrlib.IGNORE_FILENAME)
1085
1085
            l.extend([line.rstrip("\n\r").decode('utf-8') 
1432
1432
    def set_conflicts(self, arg):
1433
1433
        raise UnsupportedOperation(self.set_conflicts, self)
1434
1434
 
 
1435
    def add_conflicts(self, arg):
 
1436
        raise UnsupportedOperation(self.add_conflicts, self)
 
1437
 
1435
1438
    @needs_read_lock
1436
1439
    def conflicts(self):
1437
1440
        conflicts = ConflictList()
1497
1500
        self._put_rio('conflicts', conflicts.to_stanzas(), 
1498
1501
                      CONFLICT_HEADER_1)
1499
1502
 
 
1503
    @needs_write_lock
 
1504
    def add_conflicts(self, new_conflicts):
 
1505
        conflict_set = set(self.conflicts())
 
1506
        conflict_set.update(set(list(new_conflicts)))
 
1507
        self.set_conflicts(ConflictList(sorted(conflict_set,
 
1508
                                               key=Conflict.sort_key)))
 
1509
 
1500
1510
    @needs_read_lock
1501
1511
    def conflicts(self):
1502
1512
        try: