/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: 2010-05-02 18:32:55 UTC
  • mto: (0.200.912 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100502183255-vdvzcj2sb66cga3p
Fix file id map (de)serialization.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
1
 
# Copyright (C) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
 
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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
"""Support for committing in native Git working trees."""
19
19
 
 
20
 
20
21
from dulwich.index import (
21
22
    commit_tree,
22
23
    )
 
24
import os
23
25
import stat
24
26
 
25
 
from .. import (
26
 
    bugtracker,
27
 
    config as _mod_config,
28
 
    gpg,
29
 
    osutils,
30
 
    revision as _mod_revision,
31
 
    )
32
 
from ..errors import (
33
 
    BzrError,
34
 
    RootMissing,
35
 
    UnsupportedOperation,
36
 
    )
37
 
from ..repository import (
 
27
from bzrlib.repository import (
38
28
    CommitBuilder,
39
29
    )
40
30
 
41
31
from dulwich.objects import (
 
32
    S_IFGITLINK,
42
33
    Blob,
43
34
    Commit,
44
35
    )
45
 
from dulwich.index import read_submodule_head
46
 
 
47
 
 
48
 
from .mapping import (
49
 
    encode_git_path,
50
 
    object_mode,
51
 
    fix_person_identifier,
 
36
 
 
37
 
 
38
from bzrlib.plugins.git.mapping import (
 
39
    entry_mode,
52
40
    )
53
 
from .tree import entry_factory
54
41
 
55
42
 
56
43
class GitCommitBuilder(CommitBuilder):
57
 
    """Commit builder for Git repositories."""
58
 
 
59
 
    supports_record_entry_contents = False
60
44
 
61
45
    def __init__(self, *args, **kwargs):
62
46
        super(GitCommitBuilder, self).__init__(*args, **kwargs)
63
 
        self.random_revid = True
64
 
        self._validate_revprops(self._revprops)
65
47
        self.store = self.repository._git.object_store
66
48
        self._blobs = {}
67
 
        self._inv_delta = []
68
 
        self._deleted_paths = set()
69
 
        self._any_changes = False
70
 
        self._mapping = self.repository.get_mapping()
71
 
 
72
 
    def any_changes(self):
73
 
        return self._any_changes
 
49
 
 
50
    def record_entry_contents(self, ie, parent_invs, path, tree,
 
51
        content_summary):
 
52
        raise NotImplementedError(self.record_entry_contents)
 
53
 
 
54
    def record_delete(self, path, file_id):
 
55
        self._blobs[path] = None
 
56
        self._any_changes = True
74
57
 
75
58
    def record_iter_changes(self, workingtree, basis_revid, iter_changes):
76
 
        seen_root = False
77
 
        for change in iter_changes:
78
 
            if change.kind[1] in ("directory",):
79
 
                self._inv_delta.append(
80
 
                    (change.path[0], change.path[1], change.file_id,
81
 
                     entry_factory[change.kind[1]](
82
 
                         change.file_id, change.name[1], change.parent_id[1])))
83
 
                if change.kind[0] in ("file", "symlink"):
84
 
                    self._blobs[encode_git_path(change.path[0])] = None
85
 
                    self._any_changes = True
86
 
                if change.path[1] == "":
87
 
                    seen_root = True
88
 
                continue
 
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,
 
74
             executable) in iter_changes:
 
75
            if kind[1] in ("directory",):
 
76
                if kind[0] in ("file", "symlink"):
 
77
                    self.record_delete(path[0], file_id)
 
78
                continue
 
79
            if path[1] is None:
 
80
                self.record_delete(path[0], file_id)
 
81
                continue
 
82
            if kind[1] == "file":
 
83
                mode = stat.S_IFREG
 
84
                sha = text_sha1(path[1], file_id)
 
85
            elif kind[1] == "symlink":
 
86
                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]:
 
94
                mode |= 0111
89
95
            self._any_changes = True
90
 
            if change.path[1] is None:
91
 
                self._inv_delta.append((change.path[0], change.path[1], change.file_id, None))
92
 
                self._deleted_paths.add(encode_git_path(change.path[0]))
93
 
                continue
94
 
            try:
95
 
                entry_kls = entry_factory[change.kind[1]]
96
 
            except KeyError:
97
 
                raise KeyError("unknown kind %s" % change.kind[1])
98
 
            entry = entry_kls(change.file_id, change.name[1], change.parent_id[1])
99
 
            if change.kind[1] == "file":
100
 
                entry.executable = change.executable[1]
101
 
                blob = Blob()
102
 
                f, st = workingtree.get_file_with_stat(change.path[1])
103
 
                try:
104
 
                    blob.data = f.read()
105
 
                finally:
106
 
                    f.close()
107
 
                entry.text_size = len(blob.data)
108
 
                entry.text_sha1 = osutils.sha_string(blob.data)
109
 
                self.store.add_object(blob)
110
 
                sha = blob.id
111
 
            elif change.kind[1] == "symlink":
112
 
                symlink_target = workingtree.get_symlink_target(change.path[1])
113
 
                blob = Blob()
114
 
                blob.data = encode_git_path(symlink_target)
115
 
                self.store.add_object(blob)
116
 
                sha = blob.id
117
 
                entry.symlink_target = symlink_target
118
 
                st = None
119
 
            elif change.kind[1] == "tree-reference":
120
 
                sha = read_submodule_head(workingtree.abspath(change.path[1]))
121
 
                reference_revision = workingtree.get_reference_revision(change.path[1])
122
 
                entry.reference_revision = reference_revision
123
 
                st = None
124
 
            else:
125
 
                raise AssertionError("Unknown kind %r" % change.kind[1])
126
 
            mode = object_mode(change.kind[1], change.executable[1])
127
 
            self._inv_delta.append((change.path[0], change.path[1], change.file_id, entry))
128
 
            if change.path[0] is not None:
129
 
                self._deleted_paths.add(encode_git_path(change.path[0]))
130
 
            self._blobs[encode_git_path(change.path[1])] = (mode, sha)
131
 
            if st is not None:
132
 
                yield change.path[1], (entry.text_sha1, st)
133
 
        if not seen_root and len(self.parents) == 0:
134
 
            raise RootMissing()
135
 
        if getattr(workingtree, "basis_tree", False):
136
 
            basis_tree = workingtree.basis_tree()
137
 
        else:
138
 
            if len(self.parents) == 0:
139
 
                basis_revid = _mod_revision.NULL_REVISION
140
 
            else:
141
 
                basis_revid = self.parents[0]
142
 
            basis_tree = self.repository.revision_tree(basis_revid)
 
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])))
143
99
        # Fill in entries that were not changed
144
 
        for entry in basis_tree._iter_tree_contents(include_trees=False):
145
 
            if entry.path in self._blobs:
146
 
                continue
147
 
            if entry.path in self._deleted_paths:
148
 
                continue
149
 
            self._blobs[entry.path] = (entry.mode, entry.sha)
150
 
        self.new_inventory = None
151
 
 
152
 
    def update_basis(self, tree):
153
 
        # Nothing to do here
154
 
        pass
 
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)
155
112
 
156
113
    def finish_inventory(self):
157
114
        # eliminate blobs that were removed
158
 
        self._blobs = {k: v for (k, v) in self._blobs.items()}
 
115
        for path, entry in self._blobs.iteritems():
 
116
            if entry is None:
 
117
                del self._blobs[path]
159
118
 
160
119
    def _iterblobs(self):
161
 
        return ((path, sha, mode) for (path, (mode, sha))
162
 
                in self._blobs.items())
 
120
        return ((path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems())
163
121
 
164
122
    def commit(self, message):
165
 
        self._validate_unicode_text(message, 'commit message')
166
123
        c = Commit()
167
 
        c.parents = [self.repository.lookup_bzr_revision_id(
168
 
            revid)[0] for revid in self.parents]
 
124
        c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
169
125
        c.tree = commit_tree(self.store, self._iterblobs())
170
 
        encoding = self._revprops.pop(u'git-explicit-encoding', 'utf-8')
171
 
        c.encoding = encoding.encode('ascii')
172
 
        c.committer = fix_person_identifier(self._committer.encode(encoding))
173
 
        try:
174
 
            author = self._revprops.pop('author')
175
 
        except KeyError:
176
 
            try:
177
 
                authors = self._revprops.pop('authors').splitlines()
178
 
            except KeyError:
179
 
                author = self._committer
180
 
            else:
181
 
                if len(authors) > 1:
182
 
                    raise Exception("Unable to convert multiple authors")
183
 
                elif len(authors) == 0:
184
 
                    author = self._committer
185
 
                else:
186
 
                    author = authors[0]
187
 
        c.author = fix_person_identifier(author.encode(encoding))
188
 
        bugstext = self._revprops.pop('bugs', None)
189
 
        if bugstext is not None:
190
 
            message += "\n"
191
 
            for url, status in bugtracker.decode_bug_urls(bugstext):
192
 
                if status == bugtracker.FIXED:
193
 
                    message += "Fixes: %s\n" % url
194
 
                elif status == bugtracker.RELATED:
195
 
                    message += "Bug: %s\n" % url
196
 
                else:
197
 
                    raise bugtracker.InvalidBugStatus(status)
198
 
        if self._revprops:
199
 
            raise NotImplementedError(self._revprops)
 
126
        c.committer = self._committer
 
127
        c.author = self._revprops.get('author', self._committer)
200
128
        c.commit_time = int(self._timestamp)
201
129
        c.author_time = int(self._timestamp)
202
130
        c.commit_timezone = self._timezone
203
131
        c.author_timezone = self._timezone
204
 
        c.message = message.encode(encoding)
205
 
        if (self._config_stack.get('create_signatures') ==
206
 
                _mod_config.SIGN_ALWAYS):
207
 
            strategy = gpg.GPGStrategy(self._config_stack)
208
 
            c.gpgsig = strategy.sign(c.as_raw_string(), gpg.MODE_DETACH)
 
132
        c.encoding = 'utf-8'
 
133
        c.message = message.encode("utf-8")
209
134
        self.store.add_object(c)
 
135
        self._new_revision_id = self.repository.get_mapping().revision_id_foreign_to_bzr(c.id)
210
136
        self.repository.commit_write_group()
211
 
        self._new_revision_id = self._mapping.revision_id_foreign_to_bzr(c.id)
212
137
        return self._new_revision_id
213
 
 
214
 
    def abort(self):
215
 
        if self.repository.is_in_write_group():
216
 
            self.repository.abort_write_group()
217
 
 
218
 
    def revision_tree(self):
219
 
        return self.repository.revision_tree(self._new_revision_id)
220
 
 
221
 
    def get_basis_delta(self):
222
 
        return self._inv_delta
223
 
 
224
 
    def update_basis_by_delta(self, revid, delta):
225
 
        pass