← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
25
25
    annotate,
26
26
    bencode,
27
27
    bzrdir,
 
28
    commit,
28
29
    delta,
29
30
    errors,
30
31
    inventory,
35
36
    )
36
37
""")
37
38
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
38
 
                           ReusingTransform, NotVersionedError, CantMoveRoot,
 
39
                           ReusingTransform, CantMoveRoot,
39
40
                           ExistingLimbo, ImmortalLimbo, NoFinalPath,
40
41
                           UnableCreateSymlink)
41
42
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
927
928
        """
928
929
        return _PreviewTree(self)
929
930
 
930
 
    def commit(self, branch, message, merge_parents=None, strict=False):
 
931
    def commit(self, branch, message, merge_parents=None, strict=False,
 
932
               timestamp=None, timezone=None, committer=None, authors=None,
 
933
               revprops=None, revision_id=None):
931
934
        """Commit the result of this TreeTransform to a branch.
932
935
 
933
936
        :param branch: The branch to commit to.
934
937
        :param message: The message to attach to the commit.
935
 
        :param merge_parents: Additional parents specified by pending merges.
 
938
        :param merge_parents: Additional parent revision-ids specified by
 
939
            pending merges.
 
940
        :param strict: If True, abort the commit if there are unversioned
 
941
            files.
 
942
        :param timestamp: if not None, seconds-since-epoch for the time and
 
943
            date.  (May be a float.)
 
944
        :param timezone: Optional timezone for timestamp, as an offset in
 
945
            seconds.
 
946
        :param committer: Optional committer in email-id format.
 
947
            (e.g. "J Random Hacker <jrandom@example.com>")
 
948
        :param authors: Optional list of authors in email-id format.
 
949
        :param revprops: Optional dictionary of revision properties.
 
950
        :param revision_id: Optional revision id.  (Specifying a revision-id
 
951
            may reduce performance for some non-native formats.)
936
952
        :return: The revision_id of the revision committed.
937
953
        """
938
954
        self._check_malformed()
955
971
        if self._tree.get_revision_id() != last_rev_id:
956
972
            raise ValueError('TreeTransform not based on branch basis: %s' %
957
973
                             self._tree.get_revision_id())
958
 
        builder = branch.get_commit_builder(parent_ids)
 
974
        revprops = commit.Commit.update_revprops(revprops, branch, authors)
 
975
        builder = branch.get_commit_builder(parent_ids,
 
976
                                            timestamp=timestamp,
 
977
                                            timezone=timezone,
 
978
                                            committer=committer,
 
979
                                            revprops=revprops,
 
980
                                            revision_id=revision_id)
959
981
        preview = self.get_preview_tree()
960
982
        list(builder.record_iter_changes(preview, last_rev_id,
961
983
                                         self.iter_changes()))
1160
1182
            if trans_id not in self._new_contents:
1161
1183
                continue
1162
1184
            new_path = self._limbo_name(trans_id)
1163
 
            os.rename(old_path, new_path)
 
1185
            osutils.rename(old_path, new_path)
1164
1186
            for descendant in self._limbo_descendants(trans_id):
1165
1187
                desc_path = self._limbo_files[descendant]
1166
1188
                desc_path = new_path + desc_path[len(old_path):]
1635
1657
                      or trans_id in self._new_parent):
1636
1658
                    try:
1637
1659
                        mover.rename(full_path, self._limbo_name(trans_id))
1638
 
                    except OSError, e:
 
1660
                    except errors.TransformRenameFailed, e:
1639
1661
                        if e.errno != errno.ENOENT:
1640
1662
                            raise
1641
1663
                    else:
1666
1688
                if trans_id in self._needs_rename:
1667
1689
                    try:
1668
1690
                        mover.rename(self._limbo_name(trans_id), full_path)
1669
 
                    except OSError, e:
 
1691
                    except errors.TransformRenameFailed, e:
1670
1692
                        # We may be renaming a dangling inventory id
1671
1693
                        if e.errno != errno.ENOENT:
1672
1694
                            raise
1798
1820
            executable = self.is_executable(file_id, path)
1799
1821
        return kind, executable, None
1800
1822
 
 
1823
    def is_locked(self):
 
1824
        return False
 
1825
 
1801
1826
    def lock_read(self):
1802
1827
        # Perhaps in theory, this should lock the TreeTransform?
1803
 
        pass
 
1828
        return self
1804
1829
 
1805
1830
    def unlock(self):
1806
1831
        pass
2898
2923
        self.pending_deletions = []
2899
2924
 
2900
2925
    def rename(self, from_, to):
2901
 
        """Rename a file from one path to another.  Functions like os.rename"""
 
2926
        """Rename a file from one path to another."""
2902
2927
        try:
2903
 
            os.rename(from_, to)
2904
 
        except OSError, e:
 
2928
            osutils.rename(from_, to)
 
2929
        except (IOError, OSError), e:
2905
2930
            if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2906
2931
                raise errors.FileExists(to, str(e))
2907
 
            raise
 
2932
            # normal OSError doesn't include filenames so it's hard to see where
 
2933
            # the problem is, see https://bugs.launchpad.net/bzr/+bug/491763
 
2934
            raise errors.TransformRenameFailed(from_, to, str(e), e.errno)
2908
2935
        self.past_renames.append((from_, to))
2909
2936
 
2910
2937
    def pre_delete(self, from_, to):
2920
2947
    def rollback(self):
2921
2948
        """Reverse all renames that have been performed"""
2922
2949
        for from_, to in reversed(self.past_renames):
2923
 
            os.rename(to, from_)
 
2950
            try:
 
2951
                osutils.rename(to, from_)
 
2952
            except (OSError, IOError), e:
 
2953
                raise errors.TransformRenameFailed(to, from_, str(e), e.errno)                
2924
2954
        # after rollback, don't reuse _FileMover
2925
2955
        past_renames = None
2926
2956
        pending_deletions = None