/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 breezy/plugins/weave_fmt/workingtree.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-21 19:51:52 UTC
  • mfrom: (7143.19.8 namedtuple-list-files)
  • Revision ID: breezy.the.bot@gmail.com-20181121195152-ax5zwiz08bj4x6tc
Simplify the iterator for Tree.list_files() to exclude file kind and file_id.

Merged from https://code.launchpad.net/~jelmer/brz/namedtuple-list-files/+merge/358354

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/weave_fmt/workingtree.py
206
206
 
207
207
    def _iter_conflicts(self):
208
208
        conflicted = set()
209
 
        for info in self.list_files():
210
 
            path = info[0]
 
209
        for path, file_class, file_kind, entry in self.list_files():
211
210
            stem = get_conflicted_stem(path)
212
211
            if stem is None:
213
212
                continue