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