/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

Remove silly mapping of timezones; dulwich uses offsets now as well.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
1
 
# Copyright (C) 2009-2010 Jelmer Vernooij <jelmer@samba.org>
 
1
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
18
18
"""Support for committing in native Git working trees."""
19
19
 
20
20
 
21
 
from dulwich.index import (
22
 
    commit_tree,
23
 
    )
24
 
import os
25
21
import stat
26
22
 
 
23
from bzrlib import (
 
24
    osutils,
 
25
    )
27
26
from bzrlib.repository import (
28
27
    CommitBuilder,
29
28
    )
30
29
 
31
30
from dulwich.objects import (
32
 
    S_IFGITLINK,
33
 
    Blob,
34
31
    Commit,
35
 
    )
36
 
 
37
 
 
38
 
from bzrlib.plugins.git.mapping import (
39
 
    entry_mode,
 
32
    Tree,
40
33
    )
41
34
 
42
35
 
44
37
 
45
38
    def __init__(self, *args, **kwargs):
46
39
        super(GitCommitBuilder, self).__init__(*args, **kwargs)
47
 
        self.store = self.repository._git.object_store
48
 
        self._blobs = {}
49
 
 
50
 
    def record_entry_contents(self, ie, parent_invs, path, tree,
51
 
        content_summary):
52
 
        raise NotImplementedError(self.record_entry_contents)
 
40
        self._trees = {}
 
41
 
 
42
    def _new_tree(self, path):
 
43
        newtree = Tree()
 
44
        # FIXME: Inherit children from the base revision
 
45
        self._trees[path] = newtree
 
46
        return newtree
 
47
 
 
48
    def _add_tree(self, path):
 
49
        if path in self._trees:
 
50
            return self._trees[path]
 
51
        if path == "":
 
52
            return self._new_tree("")
 
53
        dirname, basename = osutils.split(path)
 
54
        t = self._add_tree(dirname)
 
55
        assert isinstance(basename, str)
 
56
        if not basename in t:
 
57
            newtree = self._new_tree(path)
 
58
            t[basename] = (stat.S_IFDIR, newtree.id)
 
59
            return newtree
 
60
        else:
 
61
            return self.repository._git.object_store[t[basename][1]]
 
62
 
 
63
    def _change_blob(self, path, value):
 
64
        assert isinstance(path, str)
 
65
        dirname, basename = osutils.split(path)
 
66
        t = self._add_tree(dirname)
 
67
        t[basename] = value
53
68
 
54
69
    def record_delete(self, path, file_id):
55
 
        self._blobs[path] = None
56
 
        self._any_changes = True
 
70
        dirname, basename = osutils.split(path)
 
71
        t = self._add_tree(dirname)
 
72
        del t[basename]
57
73
 
58
74
    def record_iter_changes(self, workingtree, basis_revid, iter_changes):
59
 
        index = getattr(workingtree, "index", None)
60
 
        if index is not None:
61
 
            def index_sha1(path, file_id):
62
 
                return index.get_sha1(path.encode("utf-8"))
63
 
            text_sha1 = link_sha1 = index_sha1
64
 
        else:
65
 
            def link_sha1(path, file_id):
66
 
                blob = Blob()
67
 
                blob.data = workingtree.get_symlink_target(file_id)
68
 
                return blob.id
69
 
            def text_sha1(path, file_id):
70
 
                blob = Blob()
71
 
                blob.data = workingtree.get_file_text(file_id, path)
72
 
                return blob.id
73
 
        for (file_id, path, changed_content, versioned, parent, name, kind,
 
75
        for (file_id, path, changed_content, versioned, parent, name, kind, 
74
76
             executable) in iter_changes:
75
77
            if kind[1] in ("directory",):
76
78
                if kind[0] in ("file", "symlink"):
77
79
                    self.record_delete(path[0], file_id)
78
80
                continue
79
 
            if path[1] is None:
80
 
                self.record_delete(path[0], file_id)
81
 
                continue
82
 
            if kind[1] == "file":
 
81
            if kind == "file":
83
82
                mode = stat.S_IFREG
84
 
                sha = text_sha1(path[1], file_id)
85
 
            elif kind[1] == "symlink":
 
83
            else:
86
84
                mode = stat.S_IFLNK
87
 
                sha = link_sha1(path[1], file_id)
88
 
            elif kind[1] == "tree-reference":
89
 
                mode = S_IFGITLINK
90
 
                sha = "FIXME"
91
 
            else:
92
 
                raise AssertionError("Unknown kind %r" % kind[1])
93
 
            if executable[1]:
 
85
            if executable:
94
86
                mode |= 0111
95
 
            self._any_changes = True
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])))
99
 
        # Fill in entries that were not changed
100
 
        basis_tree = workingtree.basis_tree()
101
 
        assert basis_tree.get_revision_id() == basis_revid
102
 
        for path, entry in basis_tree.iter_entries_by_dir():
103
 
            if entry.kind not in ("file", "symlink"):
104
 
                continue
105
 
            if not path in self._blobs:
106
 
                blob = Blob()
107
 
                if entry.kind == "symlink":
108
 
                    blob.data = basis_tree.get_symlink_target(entry.file_id)
109
 
                else:
110
 
                    blob.data = basis_tree.get_file_text(entry.file_id)
111
 
                self._blobs[path.encode("utf-8")] = (entry_mode(entry), blob.id)
112
 
 
113
 
    def finish_inventory(self):
114
 
        # eliminate blobs that were removed
115
 
        for path, entry in iter(self._blobs.items()):
116
 
            if entry is None:
117
 
                del self._blobs[path]
118
 
 
119
 
    def _iterblobs(self):
120
 
        return ((path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems())
 
87
            self._change_blob(path[1].encode("utf-8"), (mode, workingtree.index.get_sha1(path[1].encode("utf-8"))))
 
88
            yield file_id, path, (None, None)
121
89
 
122
90
    def commit(self, message):
 
91
        # FIXME: Eliminate any empty trees recursively
 
92
        # Write any tree objects to disk
 
93
        for path in sorted(self._trees.keys(), reverse=True):
 
94
            self.repository._git.object_store.add_object(self._trees[path])
123
95
        c = Commit()
124
 
        c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
125
 
        c.tree = commit_tree(self.store, self._iterblobs())
 
96
        root_tree = self._add_tree("")
 
97
        c.tree = root_tree.id 
126
98
        c.committer = self._committer
127
99
        c.author = self._revprops.get('author', self._committer)
128
 
        c.commit_time = int(self._timestamp)
129
 
        c.author_time = int(self._timestamp)
 
100
        c.commit_timestamp = self._timestamp
 
101
        c.author_timestamp = self._timestamp
130
102
        c.commit_timezone = self._timezone
131
103
        c.author_timezone = self._timezone
132
 
        c.encoding = 'utf-8'
133
104
        c.message = message.encode("utf-8")
134
 
        self.store.add_object(c)
135
 
        self._new_revision_id = self.repository.get_mapping().revision_id_foreign_to_bzr(c.id)
136
 
        self.repository.commit_write_group()
137
 
        return self._new_revision_id
 
105
        self.repository._git.object_store.add_object(c)