← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2006-04-05 04:54:00 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1647.
  • Revision ID: aaron.bentley@utoronto.ca-20060405045400-7b57a53ee7fdaab6
Moved and renamed conflict functions

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
50
50
from bzrlib.atomicfile import AtomicFile
51
51
from bzrlib.branch import (Branch,
52
52
                           quotefn)
53
 
from bzrlib.conflicts import (stanza_conflicts, conflict_stanzas, Conflict,
 
53
from bzrlib.conflicts import (stanzas_to_conflicts, conflicts_to_stanzas, Conflict,
54
54
                              CONFLICT_SUFFIXES)
55
55
import bzrlib.bzrdir as bzrdir
56
56
from bzrlib.decorators import needs_read_lock, needs_write_lock
1355
1355
 
1356
1356
    @needs_write_lock
1357
1357
    def set_conflict_lines(self, lines):
1358
 
        self._put_rio('conflicts', conflict_stanzas(lines), CONFLICT_HEADER_1)
 
1358
        self._put_rio('conflicts', conflicts_to_stanzas(lines), 
 
1359
                      CONFLICT_HEADER_1)
1359
1360
 
1360
1361
    @needs_read_lock
1361
1362
    def conflict_lines(self):
1368
1369
                raise ConflictFormatError()
1369
1370
        except StopIteration:
1370
1371
            raise ConflictFormatError()
1371
 
        return stanza_conflicts(RioReader(confile))
 
1372
        return stanzas_to_conflicts(RioReader(confile))
1372
1373
 
1373
1374
 
1374
1375
def get_conflicted_stem(path):