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

  • Committer: Jelmer Vernooij
  • Date: 2009-05-16 21:13:17 UTC
  • mto: (0.200.527 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20090516211317-a0s14tsrf2qusapf
Fix tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
21
21
from dulwich.index import (
22
22
    commit_tree,
23
23
    )
24
 
import os
25
24
import stat
26
25
 
27
26
from bzrlib.repository import (
32
31
    S_IFGITLINK,
33
32
    Blob,
34
33
    Commit,
 
34
    Tree,
35
35
    )
36
36
 
37
37
 
49
49
 
50
50
    def record_entry_contents(self, ie, parent_invs, path, tree,
51
51
        content_summary):
52
 
        raise NotImplementedError(self.record_entry_contents)
 
52
        raise NotImplementedError(self.record_entry_contents)        
53
53
 
54
54
    def record_delete(self, path, file_id):
55
55
        self._blobs[path] = None
70
70
                blob = Blob()
71
71
                blob.data = workingtree.get_file_text(file_id, path)
72
72
                return blob.id
73
 
        for (file_id, path, changed_content, versioned, parent, name, kind,
 
73
        for (file_id, path, changed_content, versioned, parent, name, kind, 
74
74
             executable) in iter_changes:
75
75
            if kind[1] in ("directory",):
76
76
                if kind[0] in ("file", "symlink"):
94
94
                mode |= 0111
95
95
            self._any_changes = True
96
96
            self._blobs[path[1].encode("utf-8")] = (mode, sha)
97
 
            file_sha1 = workingtree.get_file_sha1(file_id, path[1])
98
 
            yield file_id, path[1], (file_sha1, os.lstat(workingtree.abspath(path[1])))
 
97
            yield file_id, path, (None, None)
99
98
        # Fill in entries that were not changed
100
99
        basis_tree = workingtree.basis_tree()
101
100
        assert basis_tree.get_revision_id() == basis_revid
118
117
 
119
118
    def commit(self, message):
120
119
        c = Commit()
121
 
        c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
122
 
        c.tree = commit_tree(self.store,
 
120
        c.parents = [self.repository.lookup_git_revid(revid)[0] for revid in self.parents]
 
121
        c.tree = commit_tree(self.store, 
123
122
                [(path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems()])
124
123
        c.committer = self._committer
125
124
        c.author = self._revprops.get('author', self._committer)
129
128
        c.author_timezone = self._timezone
130
129
        c.message = message.encode("utf-8")
131
130
        self.store.add_object(c)
132
 
        self._new_revision_id = self.repository.get_mapping().revision_id_foreign_to_bzr(c.id)
133
 
        self.repository.commit_write_group()
134
 
        return self._new_revision_id
 
131
        return self.repository.get_mapping().revision_id_foreign_to_bzr(c.id)