/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.358.2 by Jelmer Vernooij
Refresh copyright headers, add my email.
1
# Copyright (C) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
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
0.358.1 by Jelmer Vernooij
Fix FSF address.
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
16
0.200.405 by Jelmer Vernooij
More work on commit.
17
18
"""Support for committing in native Git working trees."""
19
0.200.459 by Jelmer Vernooij
Use new commit_tree function from dulwich.
20
from dulwich.index import (
21
    commit_tree,
22
    )
0.200.405 by Jelmer Vernooij
More work on commit.
23
import stat
24
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
25
from .. import (
7206.2.1 by Jelmer Vernooij
Add support for --fixes in Git repositories.
26
    bugtracker,
0.386.1 by Jelmer Vernooij
Support signing commits.
27
    config as _mod_config,
28
    gpg,
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
29
    osutils,
0.200.1217 by Jelmer Vernooij
Support committing from a tree that does not have a basis tree.
30
    revision as _mod_revision,
31
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
32
from ..errors import (
0.333.1 by Jelmer Vernooij
Raise exception when unable to set file ids.
33
    BzrError,
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
34
    RootMissing,
0.333.1 by Jelmer Vernooij
Raise exception when unable to set file ids.
35
    UnsupportedOperation,
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
36
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
37
from ..repository import (
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
38
    CommitBuilder,
39
    )
40
41
from dulwich.objects import (
0.200.459 by Jelmer Vernooij
Use new commit_tree function from dulwich.
42
    Blob,
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
43
    Commit,
44
    )
0.429.10 by Jelmer Vernooij
use new read_submodule_head from dulwich.
45
from dulwich.index import read_submodule_head
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
46
47
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
48
from .mapping import (
0.200.1762 by Jelmer Vernooij
Fix mode handling.
49
    object_mode,
0.200.1711 by Jelmer Vernooij
Fix up identifiers if no fullname is set.
50
    fix_person_identifier,
0.200.510 by Jelmer Vernooij
Fill in old entries.
51
    )
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
52
from .tree import entry_factory
0.200.510 by Jelmer Vernooij
Fill in old entries.
53
54
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
55
class GitCommitBuilder(CommitBuilder):
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
56
    """Commit builder for Git repositories."""
57
58
    supports_record_entry_contents = False
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
59
60
    def __init__(self, *args, **kwargs):
61
        super(GitCommitBuilder, self).__init__(*args, **kwargs)
0.200.1667 by Jelmer Vernooij
Set random_revid and _new_revision_id properties.
62
        self.random_revid = True
0.200.1247 by Jelmer Vernooij
Validate revprops during commit.
63
        self._validate_revprops(self._revprops)
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
64
        self.store = self.repository._git.object_store
0.200.459 by Jelmer Vernooij
Use new commit_tree function from dulwich.
65
        self._blobs = {}
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
66
        self._inv_delta = []
0.200.1229 by Jelmer Vernooij
Provide CommitBuilder.any_changes.
67
        self._any_changes = False
0.200.1328 by Jelmer Vernooij
More test fixes.
68
        self._mapping = self.repository.get_mapping()
0.200.1229 by Jelmer Vernooij
Provide CommitBuilder.any_changes.
69
70
    def any_changes(self):
71
        return self._any_changes
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
72
73
    def record_iter_changes(self, workingtree, basis_revid, iter_changes):
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
74
        seen_root = False
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
75
        for change in iter_changes:
76
            if change.kind[1] in ("directory",):
7143.15.2 by Jelmer Vernooij
Run autopep8.
77
                self._inv_delta.append(
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
78
                    (change.path[0], change.path[1], change.file_id,
79
                     entry_factory[change.kind[1]](
80
                         change.file_id, change.name[1], change.parent_id[1])))
81
                if change.kind[0] in ("file", "symlink"):
82
                    self._blobs[change.path[0].encode("utf-8")] = None
0.200.1719 by Jelmer Vernooij
Fix pointless test.
83
                    self._any_changes = True
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
84
                if change.path[1] == "":
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
85
                    seen_root = True
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
86
                continue
0.200.1719 by Jelmer Vernooij
Fix pointless test.
87
            self._any_changes = True
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
88
            if change.path[1] is None:
89
                self._inv_delta.append((change.path[0], change.path[1], change.file_id, None))
90
                self._blobs[change.path[0].encode("utf-8")] = None
0.200.460 by Jelmer Vernooij
Somewhat fix commit in git working trees.
91
                continue
0.200.1706 by Jelmer Vernooij
Improve KeyError.
92
            try:
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
93
                entry_kls = entry_factory[change.kind[1]]
0.200.1706 by Jelmer Vernooij
Improve KeyError.
94
            except KeyError:
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
95
                raise KeyError("unknown kind %s" % change.kind[1])
96
            entry = entry_kls(change.file_id, change.name[1], change.parent_id[1])
97
            if change.kind[1] == "file":
98
                entry.executable = change.executable[1]
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
99
                blob = Blob()
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
100
                f, st = workingtree.get_file_with_stat(change.path[1])
0.345.1 by Jelmer Vernooij
Fix handling of content reporting for symlinks.
101
                try:
102
                    blob.data = f.read()
103
                finally:
104
                    f.close()
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
105
                entry.text_size = len(blob.data)
106
                entry.text_sha1 = osutils.sha_string(blob.data)
107
                self.store.add_object(blob)
108
                sha = blob.id
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
109
            elif change.kind[1] == "symlink":
110
                symlink_target = workingtree.get_symlink_target(change.path[1])
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
111
                blob = Blob()
112
                blob.data = symlink_target.encode("utf-8")
113
                self.store.add_object(blob)
114
                sha = blob.id
115
                entry.symlink_target = symlink_target
0.345.1 by Jelmer Vernooij
Fix handling of content reporting for symlinks.
116
                st = None
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
117
            elif change.kind[1] == "tree-reference":
118
                sha = read_submodule_head(workingtree.abspath(change.path[1]))
119
                reference_revision = workingtree.get_reference_revision(change.path[1])
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
120
                entry.reference_revision = reference_revision
0.345.1 by Jelmer Vernooij
Fix handling of content reporting for symlinks.
121
                st = None
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
122
            else:
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
123
                raise AssertionError("Unknown kind %r" % change.kind[1])
124
            mode = object_mode(change.kind[1], change.executable[1])
125
            self._inv_delta.append((change.path[0], change.path[1], change.file_id, entry))
126
            encoded_new_path = change.path[1].encode("utf-8")
0.200.1348 by Jelmer Vernooij
Fix handling of file id map.
127
            self._blobs[encoded_new_path] = (mode, sha)
0.345.1 by Jelmer Vernooij
Fix handling of content reporting for symlinks.
128
            if st is not None:
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
129
                yield change.path[1], (entry.text_sha1, st)
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
130
        if not seen_root and len(self.parents) == 0:
131
            raise RootMissing()
0.200.1217 by Jelmer Vernooij
Support committing from a tree that does not have a basis tree.
132
        if getattr(workingtree, "basis_tree", False):
133
            basis_tree = workingtree.basis_tree()
134
        else:
135
            if len(self.parents) == 0:
136
                basis_revid = _mod_revision.NULL_REVISION
137
            else:
138
                basis_revid = self.parents[0]
139
            basis_tree = self.repository.revision_tree(basis_revid)
0.200.510 by Jelmer Vernooij
Fill in old entries.
140
        # Fill in entries that were not changed
0.393.1 by Jelmer Vernooij
Avoid expensive bzr APIs in commit.
141
        for entry in basis_tree._iter_tree_contents(include_trees=False):
142
            if entry.path in self._blobs:
0.200.510 by Jelmer Vernooij
Fill in old entries.
143
                continue
0.393.1 by Jelmer Vernooij
Avoid expensive bzr APIs in commit.
144
            self._blobs[entry.path] = (entry.mode, entry.sha)
0.200.1145 by Jelmer Vernooij
reset new_inventory after record_iter_changes
145
        self.new_inventory = None
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
146
0.200.1670 by Jelmer Vernooij
Fix compatibility with newer versions of bzr.
147
    def update_basis(self, tree):
148
        # Nothing to do here
149
        pass
0.200.1230 by Jelmer Vernooij
Provide CommitBuilder.get_basis_delta.
150
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
151
    def finish_inventory(self):
0.200.510 by Jelmer Vernooij
Fill in old entries.
152
        # eliminate blobs that were removed
7479.2.1 by Jelmer Vernooij
Drop python2 support.
153
        self._blobs = {k: v for (k, v) in self._blobs.items() if v is not None}
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
154
0.200.737 by Jelmer Vernooij
Add helper function, always set encoding to utf-8.
155
    def _iterblobs(self):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
156
        return ((path, sha, mode) for (path, (mode, sha))
7479.2.1 by Jelmer Vernooij
Drop python2 support.
157
                in self._blobs.items())
0.200.737 by Jelmer Vernooij
Add helper function, always set encoding to utf-8.
158
0.200.391 by Jelmer Vernooij
Fix syntax error.
159
    def commit(self, message):
0.200.1177 by Jelmer Vernooij
Check message for validity.
160
        self._validate_unicode_text(message, 'commit message')
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
161
        c = Commit()
7143.15.2 by Jelmer Vernooij
Run autopep8.
162
        c.parents = [self.repository.lookup_bzr_revision_id(
163
            revid)[0] for revid in self.parents]
0.200.737 by Jelmer Vernooij
Add helper function, always set encoding to utf-8.
164
        c.tree = commit_tree(self.store, self._iterblobs())
7018.3.2 by Jelmer Vernooij
Fix some git tests.
165
        encoding = self._revprops.pop(u'git-explicit-encoding', 'utf-8')
166
        c.encoding = encoding.encode('ascii')
167
        c.committer = fix_person_identifier(self._committer.encode(encoding))
7143.6.1 by Jelmer Vernooij
Support the 'authors' revprop when creating Git commits.
168
        try:
169
            author = self._revprops.pop('author')
170
        except KeyError:
171
            try:
172
                authors = self._revprops.pop('authors').splitlines()
173
            except KeyError:
174
                author = self._committer
175
            else:
176
                if len(authors) > 1:
177
                    raise Exception("Unable to convert multiple authors")
178
                elif len(authors) == 0:
179
                    author = self._committer
180
                else:
181
                    author = authors[0]
182
        c.author = fix_person_identifier(author.encode(encoding))
7206.2.2 by Jelmer Vernooij
Review comments.
183
        bugstext = self._revprops.pop('bugs', None)
184
        if bugstext is not None:
7206.2.1 by Jelmer Vernooij
Add support for --fixes in Git repositories.
185
            message += "\n"
186
            for url, status in bugtracker.decode_bug_urls(bugstext):
187
                if status == bugtracker.FIXED:
188
                    message += "Fixes: %s\n" % url
189
                elif status == bugtracker.RELATED:
190
                    message += "Bug: %s\n" % url
191
                else:
192
                    raise bugtracker.InvalidBugStatus(status)
0.200.1709 by Jelmer Vernooij
Avoid encoding commit supplements.
193
        if self._revprops:
194
            raise NotImplementedError(self._revprops)
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
195
        c.commit_time = int(self._timestamp)
196
        c.author_time = int(self._timestamp)
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
197
        c.commit_timezone = self._timezone
198
        c.author_timezone = self._timezone
7018.3.2 by Jelmer Vernooij
Fix some git tests.
199
        c.message = message.encode(encoding)
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
200
        if (self._config_stack.get('create_signatures') ==
201
                _mod_config.SIGN_ALWAYS):
0.386.1 by Jelmer Vernooij
Support signing commits.
202
            strategy = gpg.GPGStrategy(self._config_stack)
203
            c.gpgsig = strategy.sign(c.as_raw_string(), gpg.MODE_DETACH)
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
204
        self.store.add_object(c)
0.200.702 by Jelmer Vernooij
properly commit write group
205
        self.repository.commit_write_group()
0.200.1667 by Jelmer Vernooij
Set random_revid and _new_revision_id properties.
206
        self._new_revision_id = self._mapping.revision_id_foreign_to_bzr(c.id)
207
        return self._new_revision_id
0.200.1191 by Jelmer Vernooij
Implement CommitBuilder.revision_tree.
208
0.200.1225 by Jelmer Vernooij
provide explicit CommitBuilder.abort.
209
    def abort(self):
0.334.1 by Jelmer Vernooij
Improve transaction and write group handling.
210
        if self.repository.is_in_write_group():
211
            self.repository.abort_write_group()
0.200.1225 by Jelmer Vernooij
provide explicit CommitBuilder.abort.
212
0.200.1191 by Jelmer Vernooij
Implement CommitBuilder.revision_tree.
213
    def revision_tree(self):
214
        return self.repository.revision_tree(self._new_revision_id)
0.200.1678 by Jelmer Vernooij
Fix tests.
215
216
    def get_basis_delta(self):
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
217
        return self._inv_delta
218
219
    def update_basis_by_delta(self, revid, delta):
220
        pass