/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: John Arbash Meinel
  • Date: 2006-07-03 16:19:30 UTC
  • mfrom: (1836 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1851.
  • Revision ID: john@arbash-meinel.com-20060703161930-c373bd7eddd73011
[merge] bzr.dev 1836

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1101
1101
        if hasattr(self, '_ignorelist'):
1102
1102
            return self._ignorelist
1103
1103
 
1104
 
        l = bzrlib.DEFAULT_IGNORE[:]
 
1104
        l = []
1105
1105
        if self.has_filename(bzrlib.IGNORE_FILENAME):
1106
1106
            f = self.get_file_byname(bzrlib.IGNORE_FILENAME)
1107
1107
            l.extend([line.rstrip("\n\r").decode('utf-8') 
1454
1454
    def set_conflicts(self, arg):
1455
1455
        raise UnsupportedOperation(self.set_conflicts, self)
1456
1456
 
 
1457
    def add_conflicts(self, arg):
 
1458
        raise UnsupportedOperation(self.add_conflicts, self)
 
1459
 
1457
1460
    @needs_read_lock
1458
1461
    def conflicts(self):
1459
1462
        conflicts = ConflictList()
1519
1522
        self._put_rio('conflicts', conflicts.to_stanzas(), 
1520
1523
                      CONFLICT_HEADER_1)
1521
1524
 
 
1525
    @needs_write_lock
 
1526
    def add_conflicts(self, new_conflicts):
 
1527
        conflict_set = set(self.conflicts())
 
1528
        conflict_set.update(set(list(new_conflicts)))
 
1529
        self.set_conflicts(ConflictList(sorted(conflict_set,
 
1530
                                               key=Conflict.sort_key)))
 
1531
 
1522
1532
    @needs_read_lock
1523
1533
    def conflicts(self):
1524
1534
        try: