/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-08-23 01:15:41 UTC
  • mfrom: (7520.1.4 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200823011541-nv0oh7nzaganx2qy
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/389690

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/workingtree.py
709
709
 
710
710
    def get_symlink_target(self, path):
711
711
        abspath = self.abspath(path)
712
 
        target = osutils.readlink(abspath)
713
 
        return target
 
712
        try:
 
713
            return osutils.readlink(abspath)
 
714
        except OSError as e:
 
715
            if getattr(e, 'errno', None) == errno.ENOENT:
 
716
                raise errors.NoSuchFile(path)
 
717
            raise
714
718
 
715
719
    def subsume(self, other_tree):
716
720
        raise NotImplementedError(self.subsume)
1219
1223
        """Walk the directories of this tree.
1220
1224
 
1221
1225
        returns a generator which yields items in the form:
1222
 
                ((curren_directory_path, fileid),
1223
 
                 [(file1_path, file1_name, file1_kind, (lstat), file1_id,
 
1226
                (current_directory_path,
 
1227
                 [(file1_path, file1_name, file1_kind, (lstat),
1224
1228
                   file1_kind), ... ])
1225
1229
 
1226
1230
        This API returns a generator, which is only valid during the current
1240
1244
        into files that have text conflicts.  The corresponding .THIS .BASE and
1241
1245
        .OTHER files are deleted, as per 'resolve'.
1242
1246
 
1243
 
        :return: a tuple of ConflictLists: (un_resolved, resolved).
 
1247
        :return: a tuple of lists: (un_resolved, resolved).
1244
1248
        """
1245
1249
        with self.lock_tree_write():
1246
 
            un_resolved = _mod_conflicts.ConflictList()
1247
 
            resolved = _mod_conflicts.ConflictList()
 
1250
            un_resolved = []
 
1251
            resolved = []
1248
1252
            for conflict in self.conflicts():
1249
1253
                try:
1250
1254
                    conflict.action_auto(self)