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

  • Committer: Jelmer Vernooij
  • Date: 2020-08-10 15:00:17 UTC
  • mfrom: (7490.40.99 work)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200810150017-vs7xnrd1vat4iktg
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/workingtree.py
1219
1219
        """Walk the directories of this tree.
1220
1220
 
1221
1221
        returns a generator which yields items in the form:
1222
 
                ((curren_directory_path, fileid),
1223
 
                 [(file1_path, file1_name, file1_kind, (lstat), file1_id,
 
1222
                (current_directory_path,
 
1223
                 [(file1_path, file1_name, file1_kind, (lstat),
1224
1224
                   file1_kind), ... ])
1225
1225
 
1226
1226
        This API returns a generator, which is only valid during the current
1240
1240
        into files that have text conflicts.  The corresponding .THIS .BASE and
1241
1241
        .OTHER files are deleted, as per 'resolve'.
1242
1242
 
1243
 
        :return: a tuple of ConflictLists: (un_resolved, resolved).
 
1243
        :return: a tuple of lists: (un_resolved, resolved).
1244
1244
        """
1245
1245
        with self.lock_tree_write():
1246
 
            un_resolved = _mod_conflicts.ConflictList()
1247
 
            resolved = _mod_conflicts.ConflictList()
 
1246
            un_resolved = []
 
1247
            resolved = []
1248
1248
            for conflict in self.conflicts():
1249
1249
                try:
1250
1250
                    conflict.action_auto(self)