/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 bzrlib/transport/local.py

  • Committer: Andrew Bennetts
  • Date: 2010-03-18 05:24:02 UTC
  • mto: This revision was merged to the branch mainline in revision 5141.
  • Revision ID: andrew.bennetts@canonical.com-20100318052402-vsdd48oxucivcgve
Test that pack collection uses set_sibling_indices.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/local.py
399
399
 
400
400
    def rename(self, rel_from, rel_to):
401
401
        path_from = self._abspath(rel_from)
402
 
        path_to = self._abspath(rel_to)
403
402
        try:
404
403
            # *don't* call bzrlib.osutils.rename, because we want to
405
 
            # detect conflicting names on rename, and osutils.rename tries to
406
 
            # mask cross-platform differences there; however we do update the
407
 
            # exception to include the filenames
408
 
            os.rename(path_from, path_to)
 
404
            # detect errors on rename
 
405
            os.rename(path_from, self._abspath(rel_to))
409
406
        except (IOError, OSError),e:
410
407
            # TODO: What about path_to?
411
 
            self._translate_error(
412
 
                osutils._add_rename_error_details(e, path_from, path_to),
413
 
                path_from)
 
408
            self._translate_error(e, path_from)
414
409
 
415
410
    def move(self, rel_from, rel_to):
416
411
        """Move the item at rel_from to the location at rel_to"""