← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Robert Collins
  • Date: 2005-10-06 00:52:53 UTC
  • Revision ID: robertc@robertcollins.net-20051006005253-415c38ad22094f13
define some expected behaviour for inventory_entry.snapshot

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
275
275
            if not self.is_ignored(subp):
276
276
                yield subp
277
277
 
278
 
    def iter_conflicts(self):
279
 
        conflicted = set()
280
 
        for path in (s[0] for s in self.list_files()):
281
 
            stem = get_conflicted_stem(path)
282
 
            if stem is None:
283
 
                continue
284
 
            if stem not in conflicted:
285
 
                conflicted.add(stem)
286
 
                yield stem
287
278
 
288
279
    def extras(self):
289
280
        """Yield all unknown files in this WorkingTree.
375
366
                    return pat
376
367
        else:
377
368
            return None
378
 
 
379
 
CONFLICT_SUFFIXES = ('.THIS', '.BASE', '.OTHER')
380
 
def get_conflicted_stem(path):
381
 
    for suffix in CONFLICT_SUFFIXES:
382
 
        if path.endswith(suffix):
383
 
            return path[:-len(suffix)]
 
369