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

  • Committer: INADA Naoki
  • Date: 2011-05-05 09:15:34 UTC
  • mto: (5830.3.3 i18n-msgfmt)
  • mto: This revision was merged to the branch mainline in revision 5873.
  • Revision ID: songofacandy@gmail.com-20110505091534-7sv835xpofwrmpt4
Add update-pot command to Makefile and tools/bzrgettext script that
extracts help text from bzr commands.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/commit.py
1
 
# Copyright (C) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
2
 
#
3
 
# This program is free software; you can redistribute it and/or modify
4
 
# it under the terms of the GNU General Public License as published by
5
 
# the Free Software Foundation; either version 2 of the License, or
6
 
# (at your option) any later version.
7
 
#
8
 
# This program is distributed in the hope that it will be useful,
9
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
 
# GNU General Public License for more details.
12
 
#
13
 
# You should have received a copy of the GNU General Public License
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
16
 
 
17
 
 
18
 
"""Support for committing in native Git working trees."""
19
 
 
20
 
from dulwich.index import (
21
 
    commit_tree,
22
 
    read_submodule_head,
23
 
    )
24
 
import stat
25
 
 
26
 
from .. import (
27
 
    bugtracker,
28
 
    config as _mod_config,
29
 
    gpg,
30
 
    osutils,
31
 
    revision as _mod_revision,
32
 
    )
33
 
from ..errors import (
34
 
    BzrError,
35
 
    RootMissing,
36
 
    UnsupportedOperation,
37
 
    )
38
 
from ..repository import (
39
 
    CommitBuilder,
40
 
    )
41
 
 
42
 
from dulwich.objects import (
43
 
    Blob,
44
 
    Commit,
45
 
    )
46
 
 
47
 
 
48
 
from .mapping import (
49
 
    encode_git_path,
50
 
    object_mode,
51
 
    fix_person_identifier,
52
 
    )
53
 
from .tree import entry_factory
54
 
 
55
 
 
56
 
class GitCommitBuilder(CommitBuilder):
57
 
    """Commit builder for Git repositories."""
58
 
 
59
 
    supports_record_entry_contents = False
60
 
 
61
 
    def __init__(self, *args, **kwargs):
62
 
        super(GitCommitBuilder, self).__init__(*args, **kwargs)
63
 
        self.random_revid = True
64
 
        self._validate_revprops(self._revprops)
65
 
        self.store = self.repository._git.object_store
66
 
        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
74
 
 
75
 
    def record_iter_changes(self, workingtree, basis_revid, iter_changes):
76
 
        seen_root = False
77
 
        for change in iter_changes:
78
 
            if change.kind == (None, None):
79
 
                # Ephemeral
80
 
                continue
81
 
            if change.versioned[0] and not change.copied:
82
 
                file_id = self._mapping.generate_file_id(change.path[0])
83
 
            elif change.versioned[1]:
84
 
                file_id = self._mapping.generate_file_id(change.path[1])
85
 
            else:
86
 
                file_id = None
87
 
            if change.path[1]:
88
 
                parent_id_new = self._mapping.generate_file_id(osutils.dirname(change.path[1]))
89
 
            else:
90
 
                parent_id_new = None
91
 
            if change.kind[1] in ("directory",):
92
 
                self._inv_delta.append(
93
 
                    (change.path[0], change.path[1], file_id,
94
 
                     entry_factory[change.kind[1]](
95
 
                         file_id, change.name[1], parent_id_new)))
96
 
                if change.kind[0] in ("file", "symlink"):
97
 
                    self._blobs[encode_git_path(change.path[0])] = None
98
 
                    self._any_changes = True
99
 
                if change.path[1] == "":
100
 
                    seen_root = True
101
 
                continue
102
 
            self._any_changes = True
103
 
            if change.path[1] is None:
104
 
                self._inv_delta.append((change.path[0], change.path[1], file_id, None))
105
 
                self._deleted_paths.add(encode_git_path(change.path[0]))
106
 
                continue
107
 
            try:
108
 
                entry_kls = entry_factory[change.kind[1]]
109
 
            except KeyError:
110
 
                raise KeyError("unknown kind %s" % change.kind[1])
111
 
            entry = entry_kls(file_id, change.name[1], parent_id_new)
112
 
            if change.kind[1] == "file":
113
 
                entry.executable = change.executable[1]
114
 
                blob = Blob()
115
 
                f, st = workingtree.get_file_with_stat(change.path[1])
116
 
                try:
117
 
                    blob.data = f.read()
118
 
                finally:
119
 
                    f.close()
120
 
                sha = blob.id
121
 
                if st is not None:
122
 
                    entry.text_size = st.st_size
123
 
                else:
124
 
                    entry.text_size = len(blob.data)
125
 
                entry.git_sha1 = sha
126
 
                self.store.add_object(blob)
127
 
            elif change.kind[1] == "symlink":
128
 
                symlink_target = workingtree.get_symlink_target(change.path[1])
129
 
                blob = Blob()
130
 
                blob.data = encode_git_path(symlink_target)
131
 
                self.store.add_object(blob)
132
 
                sha = blob.id
133
 
                entry.symlink_target = symlink_target
134
 
                st = None
135
 
            elif change.kind[1] == "tree-reference":
136
 
                sha = read_submodule_head(workingtree.abspath(change.path[1]))
137
 
                reference_revision = workingtree.get_reference_revision(change.path[1])
138
 
                entry.reference_revision = reference_revision
139
 
                st = None
140
 
            else:
141
 
                raise AssertionError("Unknown kind %r" % change.kind[1])
142
 
            mode = object_mode(change.kind[1], change.executable[1])
143
 
            self._inv_delta.append((change.path[0], change.path[1], file_id, entry))
144
 
            if change.path[0] is not None:
145
 
                self._deleted_paths.add(encode_git_path(change.path[0]))
146
 
            self._blobs[encode_git_path(change.path[1])] = (mode, sha)
147
 
            if st is not None:
148
 
                yield change.path[1], (entry.git_sha1, st)
149
 
        if not seen_root and len(self.parents) == 0:
150
 
            raise RootMissing()
151
 
        if getattr(workingtree, "basis_tree", False):
152
 
            basis_tree = workingtree.basis_tree()
153
 
        else:
154
 
            if len(self.parents) == 0:
155
 
                basis_revid = _mod_revision.NULL_REVISION
156
 
            else:
157
 
                basis_revid = self.parents[0]
158
 
            basis_tree = self.repository.revision_tree(basis_revid)
159
 
        # Fill in entries that were not changed
160
 
        for entry in basis_tree._iter_tree_contents(include_trees=False):
161
 
            if entry.path in self._blobs:
162
 
                continue
163
 
            if entry.path in self._deleted_paths:
164
 
                continue
165
 
            self._blobs[entry.path] = (entry.mode, entry.sha)
166
 
        self.new_inventory = None
167
 
 
168
 
    def update_basis(self, tree):
169
 
        # Nothing to do here
170
 
        pass
171
 
 
172
 
    def finish_inventory(self):
173
 
        # eliminate blobs that were removed
174
 
        self._blobs = {k: v for (k, v) in self._blobs.items()}
175
 
 
176
 
    def _iterblobs(self):
177
 
        return ((path, sha, mode) for (path, (mode, sha))
178
 
                in self._blobs.items())
179
 
 
180
 
    def commit(self, message):
181
 
        self._validate_unicode_text(message, 'commit message')
182
 
        c = Commit()
183
 
        c.parents = [self.repository.lookup_bzr_revision_id(
184
 
            revid)[0] for revid in self.parents]
185
 
        c.tree = commit_tree(self.store, self._iterblobs())
186
 
        encoding = self._revprops.pop(u'git-explicit-encoding', 'utf-8')
187
 
        c.encoding = encoding.encode('ascii')
188
 
        c.committer = fix_person_identifier(self._committer.encode(encoding))
189
 
        try:
190
 
            author = self._revprops.pop('author')
191
 
        except KeyError:
192
 
            try:
193
 
                authors = self._revprops.pop('authors').splitlines()
194
 
            except KeyError:
195
 
                author = self._committer
196
 
            else:
197
 
                if len(authors) > 1:
198
 
                    raise Exception("Unable to convert multiple authors")
199
 
                elif len(authors) == 0:
200
 
                    author = self._committer
201
 
                else:
202
 
                    author = authors[0]
203
 
        c.author = fix_person_identifier(author.encode(encoding))
204
 
        bugstext = self._revprops.pop('bugs', None)
205
 
        if bugstext is not None:
206
 
            message += "\n"
207
 
            for url, status in bugtracker.decode_bug_urls(bugstext):
208
 
                if status == bugtracker.FIXED:
209
 
                    message += "Fixes: %s\n" % url
210
 
                elif status == bugtracker.RELATED:
211
 
                    message += "Bug: %s\n" % url
212
 
                else:
213
 
                    raise bugtracker.InvalidBugStatus(status)
214
 
        if self._revprops:
215
 
            raise NotImplementedError(self._revprops)
216
 
        c.commit_time = int(self._timestamp)
217
 
        c.author_time = int(self._timestamp)
218
 
        c.commit_timezone = self._timezone
219
 
        c.author_timezone = self._timezone
220
 
        c.message = message.encode(encoding)
221
 
        if (self._config_stack.get('create_signatures') ==
222
 
                _mod_config.SIGN_ALWAYS):
223
 
            strategy = gpg.GPGStrategy(self._config_stack)
224
 
            c.gpgsig = strategy.sign(c.as_raw_string(), gpg.MODE_DETACH)
225
 
        self.store.add_object(c)
226
 
        self.repository.commit_write_group()
227
 
        self._new_revision_id = self._mapping.revision_id_foreign_to_bzr(c.id)
228
 
        return self._new_revision_id
229
 
 
230
 
    def abort(self):
231
 
        if self.repository.is_in_write_group():
232
 
            self.repository.abort_write_group()
233
 
 
234
 
    def revision_tree(self):
235
 
        return self.repository.revision_tree(self._new_revision_id)
236
 
 
237
 
    def get_basis_delta(self):
238
 
        return self._inv_delta
239
 
 
240
 
    def update_basis_by_delta(self, revid, delta):
241
 
        pass