← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Martin Pool
  • Date: 2010-07-16 15:20:17 UTC
  • mfrom: (5346.3.1 pathnotchild)
  • mto: This revision was merged to the branch mainline in revision 5351.
  • Revision ID: mbp@canonical.com-20100716152017-t4c73h9y1uoih7fb
PathNotChild should not give a traceback.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
400
400
        else:
401
401
            fixer = self.relpath
402
402
        for filename in file_list:
403
 
            try:
404
 
                relpath = fixer(osutils.dereference_path(filename))
405
 
                if view_files and not osutils.is_inside_any(view_files, relpath):
406
 
                    raise errors.FileOutsideView(filename, view_files)
407
 
                new_list.append(relpath)
408
 
            except errors.PathNotChild:
409
 
                raise errors.FileInWrongBranch(self.branch, filename)
 
403
            relpath = fixer(osutils.dereference_path(filename))
 
404
            if view_files and not osutils.is_inside_any(view_files, relpath):
 
405
                raise errors.FileOutsideView(filename, view_files)
 
406
            new_list.append(relpath)
410
407
        return new_list
411
408
 
412
 
 
413
409
    @staticmethod
414
410
    def open_downlevel(path=None):
415
411
        """Open an unsupported working tree.