/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 = []
7467.4.12 by Jelmer Vernooij
Deal with renames during commit.
67
        self._deleted_paths = set()
0.200.1229 by Jelmer Vernooij
Provide CommitBuilder.any_changes.
68
        self._any_changes = False
0.200.1328 by Jelmer Vernooij
More test fixes.
69
        self._mapping = self.repository.get_mapping()
0.200.1229 by Jelmer Vernooij
Provide CommitBuilder.any_changes.
70
71
    def any_changes(self):
72
        return self._any_changes
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
73
74
    def record_iter_changes(self, workingtree, basis_revid, iter_changes):
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
75
        seen_root = False
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
76
        for change in iter_changes:
77
            if change.kind[1] in ("directory",):
7143.15.2 by Jelmer Vernooij
Run autopep8.
78
                self._inv_delta.append(
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
79
                    (change.path[0], change.path[1], change.file_id,
80
                     entry_factory[change.kind[1]](
81
                         change.file_id, change.name[1], change.parent_id[1])))
82
                if change.kind[0] in ("file", "symlink"):
83
                    self._blobs[change.path[0].encode("utf-8")] = None
0.200.1719 by Jelmer Vernooij
Fix pointless test.
84
                    self._any_changes = True
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
85
                if change.path[1] == "":
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
86
                    seen_root = True
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
87
                continue
0.200.1719 by Jelmer Vernooij
Fix pointless test.
88
            self._any_changes = True
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
89
            if change.path[1] is None:
90
                self._inv_delta.append((change.path[0], change.path[1], change.file_id, None))
7467.4.12 by Jelmer Vernooij
Deal with renames during commit.
91
                self._deleted_paths.add(change.path[0].encode("utf-8"))
0.200.460 by Jelmer Vernooij
Somewhat fix commit in git working trees.
92
                continue
0.200.1706 by Jelmer Vernooij
Improve KeyError.
93
            try:
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
94
                entry_kls = entry_factory[change.kind[1]]
0.200.1706 by Jelmer Vernooij
Improve KeyError.
95
            except KeyError:
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
96
                raise KeyError("unknown kind %s" % change.kind[1])
97
            entry = entry_kls(change.file_id, change.name[1], change.parent_id[1])
98
            if change.kind[1] == "file":
99
                entry.executable = change.executable[1]
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
100
                blob = Blob()
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
101
                f, st = workingtree.get_file_with_stat(change.path[1])
0.345.1 by Jelmer Vernooij
Fix handling of content reporting for symlinks.
102
                try:
103
                    blob.data = f.read()
104
                finally:
105
                    f.close()
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
106
                entry.text_size = len(blob.data)
107
                entry.text_sha1 = osutils.sha_string(blob.data)
108
                self.store.add_object(blob)
109
                sha = blob.id
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
110
            elif change.kind[1] == "symlink":
111
                symlink_target = workingtree.get_symlink_target(change.path[1])
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
112
                blob = Blob()
113
                blob.data = symlink_target.encode("utf-8")
114
                self.store.add_object(blob)
115
                sha = blob.id
116
                entry.symlink_target = symlink_target
0.345.1 by Jelmer Vernooij
Fix handling of content reporting for symlinks.
117
                st = None
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
118
            elif change.kind[1] == "tree-reference":
119
                sha = read_submodule_head(workingtree.abspath(change.path[1]))
120
                reference_revision = workingtree.get_reference_revision(change.path[1])
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
121
                entry.reference_revision = reference_revision
0.345.1 by Jelmer Vernooij
Fix handling of content reporting for symlinks.
122
                st = None
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
123
            else:
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
124
                raise AssertionError("Unknown kind %r" % change.kind[1])
125
            mode = object_mode(change.kind[1], change.executable[1])
126
            self._inv_delta.append((change.path[0], change.path[1], change.file_id, entry))
7467.4.12 by Jelmer Vernooij
Deal with renames during commit.
127
            if change.path[0] is not None:
128
                self._deleted_paths.add(change.path[0].encode("utf-8"))
129
            self._blobs[change.path[1].encode("utf-8")] = (mode, sha)
0.345.1 by Jelmer Vernooij
Fix handling of content reporting for symlinks.
130
            if st is not None:
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
131
                yield change.path[1], (entry.text_sha1, st)
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
132
        if not seen_root and len(self.parents) == 0:
133
            raise RootMissing()
0.200.1217 by Jelmer Vernooij
Support committing from a tree that does not have a basis tree.
134
        if getattr(workingtree, "basis_tree", False):
135
            basis_tree = workingtree.basis_tree()
136
        else:
137
            if len(self.parents) == 0:
138
                basis_revid = _mod_revision.NULL_REVISION
139
            else:
140
                basis_revid = self.parents[0]
141
            basis_tree = self.repository.revision_tree(basis_revid)
0.200.510 by Jelmer Vernooij
Fill in old entries.
142
        # Fill in entries that were not changed
0.393.1 by Jelmer Vernooij
Avoid expensive bzr APIs in commit.
143
        for entry in basis_tree._iter_tree_contents(include_trees=False):
144
            if entry.path in self._blobs:
0.200.510 by Jelmer Vernooij
Fill in old entries.
145
                continue
7467.4.12 by Jelmer Vernooij
Deal with renames during commit.
146
            if entry.path in self._deleted_paths:
147
                continue
0.393.1 by Jelmer Vernooij
Avoid expensive bzr APIs in commit.
148
            self._blobs[entry.path] = (entry.mode, entry.sha)
0.200.1145 by Jelmer Vernooij
reset new_inventory after record_iter_changes
149
        self.new_inventory = None
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
150
0.200.1670 by Jelmer Vernooij
Fix compatibility with newer versions of bzr.
151
    def update_basis(self, tree):
152
        # Nothing to do here
153
        pass
0.200.1230 by Jelmer Vernooij
Provide CommitBuilder.get_basis_delta.
154
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
155
    def finish_inventory(self):
0.200.510 by Jelmer Vernooij
Fill in old entries.
156
        # eliminate blobs that were removed
7515.1.1 by Jelmer Vernooij
Merge lp:brz/3.1.
157
        self._blobs = {k: v for (k, v) in self._blobs.items()}
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
158
0.200.737 by Jelmer Vernooij
Add helper function, always set encoding to utf-8.
159
    def _iterblobs(self):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
160
        return ((path, sha, mode) for (path, (mode, sha))
7479.2.1 by Jelmer Vernooij
Drop python2 support.
161
                in self._blobs.items())
0.200.737 by Jelmer Vernooij
Add helper function, always set encoding to utf-8.
162
0.200.391 by Jelmer Vernooij
Fix syntax error.
163
    def commit(self, message):
0.200.1177 by Jelmer Vernooij
Check message for validity.
164
        self._validate_unicode_text(message, 'commit message')
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
165
        c = Commit()
7143.15.2 by Jelmer Vernooij
Run autopep8.
166
        c.parents = [self.repository.lookup_bzr_revision_id(
167
            revid)[0] for revid in self.parents]
0.200.737 by Jelmer Vernooij
Add helper function, always set encoding to utf-8.
168
        c.tree = commit_tree(self.store, self._iterblobs())
7018.3.2 by Jelmer Vernooij
Fix some git tests.
169
        encoding = self._revprops.pop(u'git-explicit-encoding', 'utf-8')
170
        c.encoding = encoding.encode('ascii')
171
        c.committer = fix_person_identifier(self._committer.encode(encoding))
7143.6.1 by Jelmer Vernooij
Support the 'authors' revprop when creating Git commits.
172
        try:
173
            author = self._revprops.pop('author')
174
        except KeyError:
175
            try:
176
                authors = self._revprops.pop('authors').splitlines()
177
            except KeyError:
178
                author = self._committer
179
            else:
180
                if len(authors) > 1:
181
                    raise Exception("Unable to convert multiple authors")
182
                elif len(authors) == 0:
183
                    author = self._committer
184
                else:
185
                    author = authors[0]
186
        c.author = fix_person_identifier(author.encode(encoding))
7206.2.2 by Jelmer Vernooij
Review comments.
187
        bugstext = self._revprops.pop('bugs', None)
188
        if bugstext is not None:
7206.2.1 by Jelmer Vernooij
Add support for --fixes in Git repositories.
189
            message += "\n"
190
            for url, status in bugtracker.decode_bug_urls(bugstext):
191
                if status == bugtracker.FIXED:
192
                    message += "Fixes: %s\n" % url
193
                elif status == bugtracker.RELATED:
194
                    message += "Bug: %s\n" % url
195
                else:
196
                    raise bugtracker.InvalidBugStatus(status)
0.200.1709 by Jelmer Vernooij
Avoid encoding commit supplements.
197
        if self._revprops:
198
            raise NotImplementedError(self._revprops)
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
199
        c.commit_time = int(self._timestamp)
200
        c.author_time = int(self._timestamp)
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
201
        c.commit_timezone = self._timezone
202
        c.author_timezone = self._timezone
7018.3.2 by Jelmer Vernooij
Fix some git tests.
203
        c.message = message.encode(encoding)
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
204
        if (self._config_stack.get('create_signatures') ==
205
                _mod_config.SIGN_ALWAYS):
0.386.1 by Jelmer Vernooij
Support signing commits.
206
            strategy = gpg.GPGStrategy(self._config_stack)
207
            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.
208
        self.store.add_object(c)
0.200.702 by Jelmer Vernooij
properly commit write group
209
        self.repository.commit_write_group()
0.200.1667 by Jelmer Vernooij
Set random_revid and _new_revision_id properties.
210
        self._new_revision_id = self._mapping.revision_id_foreign_to_bzr(c.id)
211
        return self._new_revision_id
0.200.1191 by Jelmer Vernooij
Implement CommitBuilder.revision_tree.
212
0.200.1225 by Jelmer Vernooij
provide explicit CommitBuilder.abort.
213
    def abort(self):
0.334.1 by Jelmer Vernooij
Improve transaction and write group handling.
214
        if self.repository.is_in_write_group():
215
            self.repository.abort_write_group()
0.200.1225 by Jelmer Vernooij
provide explicit CommitBuilder.abort.
216
0.200.1191 by Jelmer Vernooij
Implement CommitBuilder.revision_tree.
217
    def revision_tree(self):
218
        return self.repository.revision_tree(self._new_revision_id)
0.200.1678 by Jelmer Vernooij
Fix tests.
219
220
    def get_basis_delta(self):
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
221
        return self._inv_delta
222
223
    def update_basis_by_delta(self, revid, delta):
224
        pass