← 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-03-10 16:10:04 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1647.
  • Revision ID: abentley@panoramicfeedback.com-20060310161004-8e7c784a0ba225de
Switched display functions to conflict_lines

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
867
867
            if not self.is_ignored(subp):
868
868
                yield subp
869
869
 
 
870
    @deprecated_method(zero_eight)
870
871
    def iter_conflicts(self):
 
872
        return _iter_conflicts()
 
873
    def _iter_conflicts(self):
871
874
        conflicted = set()
872
875
        for path in (s[0] for s in self.list_files()):
873
876
            stem = get_conflicted_stem(path)
1277
1280
 
1278
1281
    @needs_read_lock
1279
1282
    def conflict_lines(self):
1280
 
        for conflicted in self.iter_conflicts():
 
1283
        for conflicted in self._iter_conflicts():
1281
1284
            text = True
1282
1285
            try:
1283
1286
                if file_kind(self.abspath(conflicted)) != "file":