/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 (
7490.70.1 by Jelmer Vernooij
Add functions for encoding/decoding git paths.
49
    encode_git_path,
0.200.1762 by Jelmer Vernooij
Fix mode handling.
50
    object_mode,
0.200.1711 by Jelmer Vernooij
Fix up identifiers if no fullname is set.
51
    fix_person_identifier,
0.200.510 by Jelmer Vernooij
Fill in old entries.
52
    )
0.365.1 by Jelmer Vernooij
Add custom GitTree{Directory,File,Symlink}.
53
from .tree import entry_factory
0.200.510 by Jelmer Vernooij
Fill in old entries.
54
55
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
56
class GitCommitBuilder(CommitBuilder):
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
57
    """Commit builder for Git repositories."""
58
59
    supports_record_entry_contents = False
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
60
61
    def __init__(self, *args, **kwargs):
62
        super(GitCommitBuilder, self).__init__(*args, **kwargs)
0.200.1667 by Jelmer Vernooij
Set random_revid and _new_revision_id properties.
63
        self.random_revid = True
0.200.1247 by Jelmer Vernooij
Validate revprops during commit.
64
        self._validate_revprops(self._revprops)
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
65
        self.store = self.repository._git.object_store
0.200.459 by Jelmer Vernooij
Use new commit_tree function from dulwich.
66
        self._blobs = {}
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
67
        self._inv_delta = []
7467.4.12 by Jelmer Vernooij
Deal with renames during commit.
68
        self._deleted_paths = set()
0.200.1229 by Jelmer Vernooij
Provide CommitBuilder.any_changes.
69
        self._any_changes = False
0.200.1328 by Jelmer Vernooij
More test fixes.
70
        self._mapping = self.repository.get_mapping()
0.200.1229 by Jelmer Vernooij
Provide CommitBuilder.any_changes.
71
72
    def any_changes(self):
73
        return self._any_changes
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
74
75
    def record_iter_changes(self, workingtree, basis_revid, iter_changes):
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
76
        seen_root = False
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
77
        for change in iter_changes:
78
            if change.kind[1] in ("directory",):
7143.15.2 by Jelmer Vernooij
Run autopep8.
79
                self._inv_delta.append(
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
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"):
7490.70.1 by Jelmer Vernooij
Add functions for encoding/decoding git paths.
84
                    self._blobs[encode_git_path(change.path[0])] = None
0.200.1719 by Jelmer Vernooij
Fix pointless test.
85
                    self._any_changes = True
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
86
                if change.path[1] == "":
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
87
                    seen_root = True
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
88
                continue
0.200.1719 by Jelmer Vernooij
Fix pointless test.
89
            self._any_changes = True
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
90
            if change.path[1] is None:
91
                self._inv_delta.append((change.path[0], change.path[1], change.file_id, None))
7490.70.1 by Jelmer Vernooij
Add functions for encoding/decoding git paths.
92
                self._deleted_paths.add(encode_git_path(change.path[0]))
0.200.460 by Jelmer Vernooij
Somewhat fix commit in git working trees.
93
                continue
0.200.1706 by Jelmer Vernooij
Improve KeyError.
94
            try:
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
95
                entry_kls = entry_factory[change.kind[1]]
0.200.1706 by Jelmer Vernooij
Improve KeyError.
96
            except KeyError:
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
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]
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
101
                blob = Blob()
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
102
                f, st = workingtree.get_file_with_stat(change.path[1])
0.345.1 by Jelmer Vernooij
Fix handling of content reporting for symlinks.
103
                try:
104
                    blob.data = f.read()
105
                finally:
106
                    f.close()
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
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
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
111
            elif change.kind[1] == "symlink":
112
                symlink_target = workingtree.get_symlink_target(change.path[1])
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
113
                blob = Blob()
7490.70.1 by Jelmer Vernooij
Add functions for encoding/decoding git paths.
114
                blob.data = encode_git_path(symlink_target)
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
115
                self.store.add_object(blob)
116
                sha = blob.id
117
                entry.symlink_target = symlink_target
0.345.1 by Jelmer Vernooij
Fix handling of content reporting for symlinks.
118
                st = None
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
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])
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
122
                entry.reference_revision = reference_revision
0.345.1 by Jelmer Vernooij
Fix handling of content reporting for symlinks.
123
                st = None
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
124
            else:
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
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))
7467.4.12 by Jelmer Vernooij
Deal with renames during commit.
128
            if change.path[0] is not None:
7490.70.1 by Jelmer Vernooij
Add functions for encoding/decoding git paths.
129
                self._deleted_paths.add(encode_git_path(change.path[0]))
130
            self._blobs[encode_git_path(change.path[1])] = (mode, sha)
0.345.1 by Jelmer Vernooij
Fix handling of content reporting for symlinks.
131
            if st is not None:
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
132
                yield change.path[1], (entry.text_sha1, st)
0.200.1144 by Jelmer Vernooij
Raise RootMissing if root not specified.
133
        if not seen_root and len(self.parents) == 0:
134
            raise RootMissing()
0.200.1217 by Jelmer Vernooij
Support committing from a tree that does not have a basis tree.
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)
0.200.510 by Jelmer Vernooij
Fill in old entries.
143
        # Fill in entries that were not changed
0.393.1 by Jelmer Vernooij
Avoid expensive bzr APIs in commit.
144
        for entry in basis_tree._iter_tree_contents(include_trees=False):
145
            if entry.path in self._blobs:
0.200.510 by Jelmer Vernooij
Fill in old entries.
146
                continue
7467.4.12 by Jelmer Vernooij
Deal with renames during commit.
147
            if entry.path in self._deleted_paths:
148
                continue
0.393.1 by Jelmer Vernooij
Avoid expensive bzr APIs in commit.
149
            self._blobs[entry.path] = (entry.mode, entry.sha)
0.200.1145 by Jelmer Vernooij
reset new_inventory after record_iter_changes
150
        self.new_inventory = None
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
151
0.200.1670 by Jelmer Vernooij
Fix compatibility with newer versions of bzr.
152
    def update_basis(self, tree):
153
        # Nothing to do here
154
        pass
0.200.1230 by Jelmer Vernooij
Provide CommitBuilder.get_basis_delta.
155
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
156
    def finish_inventory(self):
0.200.510 by Jelmer Vernooij
Fill in old entries.
157
        # eliminate blobs that were removed
7515.1.1 by Jelmer Vernooij
Merge lp:brz/3.1.
158
        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.
159
0.200.737 by Jelmer Vernooij
Add helper function, always set encoding to utf-8.
160
    def _iterblobs(self):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
161
        return ((path, sha, mode) for (path, (mode, sha))
7479.2.1 by Jelmer Vernooij
Drop python2 support.
162
                in self._blobs.items())
0.200.737 by Jelmer Vernooij
Add helper function, always set encoding to utf-8.
163
0.200.391 by Jelmer Vernooij
Fix syntax error.
164
    def commit(self, message):
0.200.1177 by Jelmer Vernooij
Check message for validity.
165
        self._validate_unicode_text(message, 'commit message')
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
166
        c = Commit()
7143.15.2 by Jelmer Vernooij
Run autopep8.
167
        c.parents = [self.repository.lookup_bzr_revision_id(
168
            revid)[0] for revid in self.parents]
0.200.737 by Jelmer Vernooij
Add helper function, always set encoding to utf-8.
169
        c.tree = commit_tree(self.store, self._iterblobs())
7018.3.2 by Jelmer Vernooij
Fix some git tests.
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))
7143.6.1 by Jelmer Vernooij
Support the 'authors' revprop when creating Git commits.
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))
7206.2.2 by Jelmer Vernooij
Review comments.
188
        bugstext = self._revprops.pop('bugs', None)
189
        if bugstext is not None:
7206.2.1 by Jelmer Vernooij
Add support for --fixes in Git repositories.
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)
0.200.1709 by Jelmer Vernooij
Avoid encoding commit supplements.
198
        if self._revprops:
199
            raise NotImplementedError(self._revprops)
0.200.509 by Jelmer Vernooij
Fix a bunch of bugs in commit, partially works now.
200
        c.commit_time = int(self._timestamp)
201
        c.author_time = int(self._timestamp)
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
202
        c.commit_timezone = self._timezone
203
        c.author_timezone = self._timezone
7018.3.2 by Jelmer Vernooij
Fix some git tests.
204
        c.message = message.encode(encoding)
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
205
        if (self._config_stack.get('create_signatures') ==
206
                _mod_config.SIGN_ALWAYS):
0.386.1 by Jelmer Vernooij
Support signing commits.
207
            strategy = gpg.GPGStrategy(self._config_stack)
208
            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.
209
        self.store.add_object(c)
0.200.702 by Jelmer Vernooij
properly commit write group
210
        self.repository.commit_write_group()
0.200.1667 by Jelmer Vernooij
Set random_revid and _new_revision_id properties.
211
        self._new_revision_id = self._mapping.revision_id_foreign_to_bzr(c.id)
212
        return self._new_revision_id
0.200.1191 by Jelmer Vernooij
Implement CommitBuilder.revision_tree.
213
0.200.1225 by Jelmer Vernooij
provide explicit CommitBuilder.abort.
214
    def abort(self):
0.334.1 by Jelmer Vernooij
Improve transaction and write group handling.
215
        if self.repository.is_in_write_group():
216
            self.repository.abort_write_group()
0.200.1225 by Jelmer Vernooij
provide explicit CommitBuilder.abort.
217
0.200.1191 by Jelmer Vernooij
Implement CommitBuilder.revision_tree.
218
    def revision_tree(self):
219
        return self.repository.revision_tree(self._new_revision_id)
0.200.1678 by Jelmer Vernooij
Fix tests.
220
221
    def get_basis_delta(self):
0.200.1700 by Jelmer Vernooij
Implement get_basis_delta.
222
        return self._inv_delta
223
224
    def update_basis_by_delta(self, revid, delta):
225
        pass