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

  • Committer: Robert Collins
  • Date: 2010-05-27 21:16:48 UTC
  • mto: This revision was merged to the branch mainline in revision 5266.
  • Revision ID: robertc@robertcollins.net-20100527211648-1mj8m4dh0ricku21
Final fix for 'no help for command' issue. We now show a clean message
when a command has no help, document how to set help more clearly, and
test that all commands available to the test suite have help.
(Robert Collins, #177500)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1657
1657
                      or trans_id in self._new_parent):
1658
1658
                    try:
1659
1659
                        mover.rename(full_path, self._limbo_name(trans_id))
1660
 
                    except OSError, e:
 
1660
                    except errors.TransformRenameFailed, e:
1661
1661
                        if e.errno != errno.ENOENT:
1662
1662
                            raise
1663
1663
                    else:
1688
1688
                if trans_id in self._needs_rename:
1689
1689
                    try:
1690
1690
                        mover.rename(self._limbo_name(trans_id), full_path)
1691
 
                    except OSError, e:
 
1691
                    except errors.TransformRenameFailed, e:
1692
1692
                        # We may be renaming a dangling inventory id
1693
1693
                        if e.errno != errno.ENOENT:
1694
1694
                            raise
1792
1792
        parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
1793
1793
                       self._iter_parent_trees()]
1794
1794
        vf.add_lines((file_id, tree_revision), parent_keys,
1795
 
                     self.get_file(file_id).readlines())
 
1795
                     self.get_file_lines(file_id))
1796
1796
        repo = self._get_repository()
1797
1797
        base_vf = repo.texts
1798
1798
        if base_vf not in vf.fallback_versionedfiles:
2460
2460
    if entry.kind == "directory":
2461
2461
        return True
2462
2462
    if entry.kind == "file":
2463
 
        if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2464
 
            return True
 
2463
        f = file(target_path, 'rb')
 
2464
        try:
 
2465
            if tree.get_file_text(file_id) == f.read():
 
2466
                return True
 
2467
        finally:
 
2468
            f.close()
2465
2469
    elif entry.kind == "symlink":
2466
2470
        if tree.get_symlink_target(file_id) == os.readlink(target_path):
2467
2471
            return True
2926
2930
        """Rename a file from one path to another."""
2927
2931
        try:
2928
2932
            osutils.rename(from_, to)
2929
 
        except OSError, e:
 
2933
        except (IOError, OSError), e:
2930
2934
            if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2931
2935
                raise errors.FileExists(to, str(e))
2932
 
            raise
 
2936
            # normal OSError doesn't include filenames so it's hard to see where
 
2937
            # the problem is, see https://bugs.launchpad.net/bzr/+bug/491763
 
2938
            raise errors.TransformRenameFailed(from_, to, str(e), e.errno)
2933
2939
        self.past_renames.append((from_, to))
2934
2940
 
2935
2941
    def pre_delete(self, from_, to):
2945
2951
    def rollback(self):
2946
2952
        """Reverse all renames that have been performed"""
2947
2953
        for from_, to in reversed(self.past_renames):
2948
 
            osutils.rename(to, from_)
 
2954
            try:
 
2955
                osutils.rename(to, from_)
 
2956
            except (OSError, IOError), e:
 
2957
                raise errors.TransformRenameFailed(to, from_, str(e), e.errno)                
2949
2958
        # after rollback, don't reuse _FileMover
2950
2959
        past_renames = None
2951
2960
        pending_deletions = None