/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) 2008-2018 Jelmer Vernooij <jelmer@jelmer.uk>
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
2
# Copyright (C) 2007 Canonical Ltd
3
# Copyright (C) 2008 John Carr
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
4
#
5
# This program is free software; you can redistribute it and/or modify
6
# it under the terms of the GNU General Public License as published by
7
# the Free Software Foundation; either version 2 of the License, or
8
# (at your option) any later version.
9
#
10
# This program is distributed in the hope that it will be useful,
11
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
# GNU General Public License for more details.
14
#
15
# You should have received a copy of the GNU General Public License
16
# along with this program; if not, write to the Free Software
0.358.1 by Jelmer Vernooij
Fix FSF address.
17
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
18
19
"""Converters, etc for going between Bazaar and Git ids."""
20
0.200.1594 by Jelmer Vernooij
Use absolute_import everywhere.
21
from __future__ import absolute_import
22
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
23
import base64
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
24
import stat
25
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
26
from .. import (
0.200.926 by Jelmer Vernooij
Fix formatting, drop support for Bazaar < 2.0.
27
    bencode,
0.200.292 by Jelmer Vernooij
Fix formatting.
28
    errors,
29
    foreign,
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
30
    trace,
7018.3.2 by Jelmer Vernooij
Fix some git tests.
31
    urlutils,
0.200.292 by Jelmer Vernooij
Fix formatting.
32
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
33
from ..foreign import (
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
34
    ForeignVcs,
35
    VcsMappingRegistry,
0.200.292 by Jelmer Vernooij
Fix formatting.
36
    ForeignRevision,
37
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
38
from ..revision import (
0.200.701 by Jelmer Vernooij
Fix check in git repos.
39
    NULL_REVISION,
40
    )
6986.2.3 by Jelmer Vernooij
Merge trunk
41
from ..sixish import (
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
42
    PY3,
7018.3.2 by Jelmer Vernooij
Fix some git tests.
43
    text_type,
44
    viewitems,
45
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
46
from .errors import (
0.200.1598 by Jelmer Vernooij
Print proper error when unknown fields are encountered.
47
    NoPushSupport,
48
    UnknownCommitExtra,
0.200.1640 by Jelmer Vernooij
Support HG extra 'amend_source'.
49
    UnknownMercurialCommitExtra,
0.200.1598 by Jelmer Vernooij
Print proper error when unknown fields are encountered.
50
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
51
from .hg import (
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
52
    format_hg_metadata,
53
    extract_hg_metadata,
54
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
55
from .roundtrip import (
0.252.2 by Jelmer Vernooij
Add functions for adding metadata to revision messages.
56
    extract_bzr_metadata,
0.252.4 by Jelmer Vernooij
More work on roundtripping.
57
    inject_bzr_metadata,
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
58
    CommitSupplement,
0.252.23 by Jelmer Vernooij
More work on roundtripping support.
59
    deserialize_fileid_map,
60
    serialize_fileid_map,
0.252.2 by Jelmer Vernooij
Add functions for adding metadata to revision messages.
61
    )
0.200.309 by Jelmer Vernooij
Add XML escaping to work around serialization bug in bzr.
62
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
63
64
DEFAULT_FILE_MODE = stat.S_IFREG | 0o644
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
65
HG_RENAME_SOURCE = b"HG:rename-source"
66
HG_EXTRA = b"HG:extra"
0.200.1640 by Jelmer Vernooij
Support HG extra 'amend_source'.
67
68
# This HG extra is used to indicate the commit that this commit was based on.
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
69
HG_EXTRA_AMEND_SOURCE = b"amend_source"
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
70
0.200.1712 by Jelmer Vernooij
Add file_id prefix.
71
FILE_ID_PREFIX = b'git:'
72
7143.7.1 by Jelmer Vernooij
Simplify brz-git, drop imports.
73
# Always the same.
74
ROOT_ID = b"TREE_ROOT"
75
0.206.1 by Jelmer Vernooij
Use foreign utility functions.
76
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
77
def escape_file_id(file_id):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
78
    file_id = file_id.replace(b'_', b'__')
79
    file_id = file_id.replace(b' ', b'_s')
80
    file_id = file_id.replace(b'\x0c', b'_c')
81
    return file_id
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
82
83
84
def unescape_file_id(file_id):
7018.3.6 by Jelmer Vernooij
Fix unescape tests.
85
    ret = bytearray()
0.200.390 by Jelmer Vernooij
Fix file id unescape function when there are other underscores in the file id.
86
    i = 0
87
    while i < len(file_id):
7143.15.2 by Jelmer Vernooij
Run autopep8.
88
        if file_id[i:i + 1] != b'_':
0.200.390 by Jelmer Vernooij
Fix file id unescape function when there are other underscores in the file id.
89
            ret.append(file_id[i])
90
        else:
7143.15.2 by Jelmer Vernooij
Run autopep8.
91
            if file_id[i + 1:i + 2] == b'_':
7018.3.6 by Jelmer Vernooij
Fix unescape tests.
92
                ret.append(b"_"[0])
7143.15.2 by Jelmer Vernooij
Run autopep8.
93
            elif file_id[i + 1:i + 2] == b's':
7018.3.6 by Jelmer Vernooij
Fix unescape tests.
94
                ret.append(b" "[0])
7143.15.2 by Jelmer Vernooij
Run autopep8.
95
            elif file_id[i + 1:i + 2] == b'c':
7018.3.6 by Jelmer Vernooij
Fix unescape tests.
96
                ret.append(b"\x0c"[0])
0.200.390 by Jelmer Vernooij
Fix file id unescape function when there are other underscores in the file id.
97
            else:
0.200.1712 by Jelmer Vernooij
Add file_id prefix.
98
                raise ValueError("unknown escape character %s" %
7143.15.2 by Jelmer Vernooij
Run autopep8.
99
                                 file_id[i + 1:i + 2])
0.200.390 by Jelmer Vernooij
Fix file id unescape function when there are other underscores in the file id.
100
            i += 1
101
        i += 1
7018.3.6 by Jelmer Vernooij
Fix unescape tests.
102
    return bytes(ret)
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
103
104
0.200.376 by Jelmer Vernooij
Make sure author and committer names pushed to git contain < and >, otherwise the git parser barfs.
105
def fix_person_identifier(text):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
106
    if b"<" not in text and b">" not in text:
0.402.1 by Jelmer Vernooij
Improve identifier handling.
107
        username = text
108
        email = text
109
    else:
6973.13.2 by Jelmer Vernooij
Fix some more tests.
110
        if text.rindex(b">") < text.rindex(b"<"):
0.402.1 by Jelmer Vernooij
Improve identifier handling.
111
            raise ValueError(text)
6973.13.2 by Jelmer Vernooij
Fix some more tests.
112
        username, email = text.split(b"<", 2)[-2:]
113
        email = email.split(b">", 1)[0]
114
        if username.endswith(b" "):
0.402.1 by Jelmer Vernooij
Improve identifier handling.
115
            username = username[:-1]
6973.13.2 by Jelmer Vernooij
Fix some more tests.
116
    return b"%s <%s>" % (username, email)
0.200.376 by Jelmer Vernooij
Make sure author and committer names pushed to git contain < and >, otherwise the git parser barfs.
117
118
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
119
def warn_escaped(commit, num_escaped):
120
    trace.warning("Escaped %d XML-invalid characters in %s. Will be unable "
121
                  "to regenerate the SHA map.", num_escaped, commit)
122
123
124
def warn_unusual_mode(commit, path, mode):
0.200.826 by Jelmer Vernooij
Fix some long lines.
125
    trace.mutter("Unusual file mode %o for %s in %s. Storing as revision "
126
                 "property. ", mode, path, commit)
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
127
128
0.206.1 by Jelmer Vernooij
Use foreign utility functions.
129
class BzrGitMapping(foreign.VcsMapping):
0.200.97 by Jelmer Vernooij
use mapping object.
130
    """Class that maps between Git and Bazaar semantics."""
131
    experimental = False
132
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
133
    BZR_FILE_IDS_FILE = None
0.252.23 by Jelmer Vernooij
More work on roundtripping support.
134
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
135
    BZR_DUMMY_FILE = None
0.252.26 by Jelmer Vernooij
Add is_control_file method to BzrGitMapping.
136
0.200.1328 by Jelmer Vernooij
More test fixes.
137
    def is_special_file(self, filename):
138
        return (filename in (self.BZR_FILE_IDS_FILE, self.BZR_DUMMY_FILE))
139
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
140
    def __init__(self):
0.200.1263 by Jelmer Vernooij
Fix foreign_vcs_git.
141
        super(BzrGitMapping, self).__init__(foreign_vcs_git)
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
142
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
143
    def __eq__(self, other):
7143.15.2 by Jelmer Vernooij
Run autopep8.
144
        return (type(self) == type(other)
145
                and self.revid_prefix == other.revid_prefix)
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
146
147
    @classmethod
148
    def revision_id_foreign_to_bzr(cls, git_rev_id):
0.200.97 by Jelmer Vernooij
use mapping object.
149
        """Convert a git revision id handle to a Bazaar revision id."""
0.200.891 by Jelmer Vernooij
Use ZERO_SHA constant where possible.
150
        from dulwich.protocol import ZERO_SHA
151
        if git_rev_id == ZERO_SHA:
0.200.769 by Jelmer Vernooij
Cope with open_branch() actually checking whether there is a branch present.
152
            return NULL_REVISION
7018.3.2 by Jelmer Vernooij
Fix some git tests.
153
        return b"%s:%s" % (cls.revid_prefix, git_rev_id)
0.200.97 by Jelmer Vernooij
use mapping object.
154
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
155
    @classmethod
156
    def revision_id_bzr_to_foreign(cls, bzr_rev_id):
0.200.97 by Jelmer Vernooij
use mapping object.
157
        """Convert a Bazaar revision id to a git revision id handle."""
7018.3.2 by Jelmer Vernooij
Fix some git tests.
158
        if not bzr_rev_id.startswith(b"%s:" % cls.revid_prefix):
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
159
            raise errors.InvalidRevisionId(bzr_rev_id, cls)
7143.15.2 by Jelmer Vernooij
Run autopep8.
160
        return bzr_rev_id[len(cls.revid_prefix) + 1:], cls()
0.200.97 by Jelmer Vernooij
use mapping object.
161
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
162
    def generate_file_id(self, path):
0.200.297 by Jelmer Vernooij
Cope with non-ascii characters in filenames (needs a test..).
163
        # Git paths are just bytestrings
164
        # We must just hope they are valid UTF-8..
6973.6.2 by Jelmer Vernooij
Fix more tests.
165
        if isinstance(path, text_type):
0.200.973 by Jelmer Vernooij
Add tests for generate_file_id.
166
            path = path.encode("utf-8")
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
167
        if path == b"":
168
            return ROOT_ID
0.200.1712 by Jelmer Vernooij
Add file_id prefix.
169
        return FILE_ID_PREFIX + escape_file_id(path)
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
170
0.230.2 by Jelmer Vernooij
Fix versionedfiles.
171
    def parse_file_id(self, file_id):
172
        if file_id == ROOT_ID:
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
173
            return u""
0.200.1712 by Jelmer Vernooij
Add file_id prefix.
174
        if not file_id.startswith(FILE_ID_PREFIX):
175
            raise ValueError
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
176
        return unescape_file_id(file_id[len(FILE_ID_PREFIX):]).decode('utf-8')
0.230.2 by Jelmer Vernooij
Fix versionedfiles.
177
0.252.31 by Jelmer Vernooij
Properly escape revids when using them in ref names.
178
    def revid_as_refname(self, revid):
7018.3.2 by Jelmer Vernooij
Fix some git tests.
179
        if not isinstance(revid, bytes):
180
            raise TypeError(revid)
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
181
        if PY3:
182
            revid = revid.decode('utf-8')
183
        quoted_revid = urlutils.quote(revid)
184
        return b"refs/bzr/" + quoted_revid.encode('utf-8')
0.252.31 by Jelmer Vernooij
Properly escape revids when using them in ref names.
185
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
186
    def import_unusual_file_modes(self, rev, unusual_file_modes):
187
        if unusual_file_modes:
0.200.878 by Jelmer Vernooij
Fix determining of unusual file modes.
188
            ret = [(path, unusual_file_modes[path])
189
                   for path in sorted(unusual_file_modes.keys())]
6973.12.9 by Jelmer Vernooij
More fixes.
190
            rev.properties[u'file-modes'] = bencode.bencode(ret)
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
191
0.200.547 by Jelmer Vernooij
Support getting unusual file modes out of revision properties.
192
    def export_unusual_file_modes(self, rev):
193
        try:
6973.12.9 by Jelmer Vernooij
More fixes.
194
            file_modes = rev.properties[u'file-modes']
0.200.547 by Jelmer Vernooij
Support getting unusual file modes out of revision properties.
195
        except KeyError:
196
            return {}
0.200.894 by Jelmer Vernooij
Simplify formatting a bit.
197
        else:
0.421.6 by Jelmer Vernooij
Some more simplifications.
198
            return dict(bencode.bdecode(file_modes.encode("utf-8")))
0.200.547 by Jelmer Vernooij
Support getting unusual file modes out of revision properties.
199
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
200
    def _generate_git_svn_metadata(self, rev, encoding):
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
201
        try:
6973.12.9 by Jelmer Vernooij
More fixes.
202
            git_svn_id = rev.properties[u"git-svn-id"]
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
203
        except KeyError:
204
            return ""
0.200.894 by Jelmer Vernooij
Simplify formatting a bit.
205
        else:
206
            return "\ngit-svn-id: %s\n" % git_svn_id.encode(encoding)
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
207
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
208
    def _generate_hg_message_tail(self, rev):
209
        extra = {}
210
        renames = []
0.200.639 by Jelmer Vernooij
Support renames in hg-git messages as well.
211
        branch = 'default'
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
212
        for name in rev.properties:
6973.12.9 by Jelmer Vernooij
More fixes.
213
            if name == u'hg:extra:branch':
214
                branch = rev.properties[u'hg:extra:branch']
215
            elif name.startswith(u'hg:extra'):
216
                extra[name[len(u'hg:extra:'):]] = base64.b64decode(
0.200.826 by Jelmer Vernooij
Fix some long lines.
217
                    rev.properties[name])
6973.12.9 by Jelmer Vernooij
More fixes.
218
            elif name == u'hg:renames':
0.200.826 by Jelmer Vernooij
Fix some long lines.
219
                renames = bencode.bdecode(base64.b64decode(
6973.12.9 by Jelmer Vernooij
More fixes.
220
                    rev.properties[u'hg:renames']))
0.200.639 by Jelmer Vernooij
Support renames in hg-git messages as well.
221
            # TODO: Export other properties as 'bzr:' extras?
0.200.660 by Jelmer Vernooij
Fix encoding issues.
222
        ret = format_hg_metadata(renames, branch, extra)
6973.13.2 by Jelmer Vernooij
Fix some more tests.
223
        if not isinstance(ret, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
224
            raise TypeError(ret)
0.200.660 by Jelmer Vernooij
Fix encoding issues.
225
        return ret
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
226
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
227
    def _extract_git_svn_metadata(self, rev, message):
228
        lines = message.split("\n")
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
229
        if not (lines[-1] == "" and len(lines) >= 2 and
230
                lines[-2].startswith("git-svn-id:")):
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
231
            return message
0.200.652 by Jelmer Vernooij
Split out git-svn-id parser as separate function, implement ForeignGit.serialize_foreign_revid.
232
        git_svn_id = lines[-2].split(": ", 1)[1]
6973.12.9 by Jelmer Vernooij
More fixes.
233
        rev.properties[u'git-svn-id'] = git_svn_id
0.200.652 by Jelmer Vernooij
Split out git-svn-id parser as separate function, implement ForeignGit.serialize_foreign_revid.
234
        (url, rev, uuid) = parse_git_svn_id(git_svn_id)
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
235
        # FIXME: Convert this to converted-from property somehow..
0.361.1 by Jelmer Vernooij
Don't use assert.
236
        return "\n".join(lines[:-2])
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
237
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
238
    def _extract_hg_metadata(self, rev, message):
239
        (message, renames, branch, extra) = extract_hg_metadata(message)
240
        if branch is not None:
6973.12.9 by Jelmer Vernooij
More fixes.
241
            rev.properties[u'hg:extra:branch'] = branch
7018.3.2 by Jelmer Vernooij
Fix some git tests.
242
        for name, value in viewitems(extra):
6973.12.9 by Jelmer Vernooij
More fixes.
243
            rev.properties[u'hg:extra:' + name] = base64.b64encode(value)
0.200.639 by Jelmer Vernooij
Support renames in hg-git messages as well.
244
        if renames:
6973.12.9 by Jelmer Vernooij
More fixes.
245
            rev.properties[u'hg:renames'] = base64.b64encode(bencode.bencode(
7018.3.2 by Jelmer Vernooij
Fix some git tests.
246
                [(new, old) for (old, new) in viewitems(renames)]))
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
247
        return message
248
0.252.2 by Jelmer Vernooij
Add functions for adding metadata to revision messages.
249
    def _extract_bzr_metadata(self, rev, message):
250
        (message, metadata) = extract_bzr_metadata(message)
0.252.4 by Jelmer Vernooij
More work on roundtripping.
251
        return message, metadata
0.252.2 by Jelmer Vernooij
Add functions for adding metadata to revision messages.
252
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
253
    def _decode_commit_message(self, rev, message, encoding):
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
254
        return message.decode(encoding), CommitSupplement()
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
255
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
256
    def _encode_commit_message(self, rev, message, encoding):
257
        return message.encode(encoding)
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
258
0.252.22 by Jelmer Vernooij
Fix file id map (de)serialization.
259
    def export_fileid_map(self, fileid_map):
260
        """Export a file id map to a fileid map.
261
262
        :param fileid_map: File id map, mapping paths to file ids
0.320.1 by Jelmer Vernooij
Don't set file ids unless different from default.
263
        :return: A Git blob object (or None if there are no entries)
0.252.22 by Jelmer Vernooij
Fix file id map (de)serialization.
264
        """
0.252.23 by Jelmer Vernooij
More work on roundtripping support.
265
        from dulwich.objects import Blob
266
        b = Blob()
267
        b.set_raw_chunks(serialize_fileid_map(fileid_map))
268
        return b
0.252.22 by Jelmer Vernooij
Fix file id map (de)serialization.
269
0.200.1509 by Jelmer Vernooij
Properly raise exception when pulling from git into bzr without experimental mappings.
270
    def export_commit(self, rev, tree_sha, parent_lookup, lossy,
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
271
                      verifiers):
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
272
        """Turn a Bazaar revision in to a Git commit
273
274
        :param tree_sha: Tree sha for the commit
0.200.826 by Jelmer Vernooij
Fix some long lines.
275
        :param parent_lookup: Function for looking up the GIT sha equiv of a
276
            bzr revision
0.200.1509 by Jelmer Vernooij
Properly raise exception when pulling from git into bzr without experimental mappings.
277
        :param lossy: Whether to store roundtripping information.
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
278
        :param verifiers: Verifiers info
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
279
        :return dulwich.objects.Commit represent the revision:
280
        """
0.413.2 by Jelmer Vernooij
Add support for the mergetag property in git.
281
        from dulwich.objects import Commit, Tag
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
282
        commit = Commit()
283
        commit.tree = tree_sha
0.200.1509 by Jelmer Vernooij
Properly raise exception when pulling from git into bzr without experimental mappings.
284
        if not lossy:
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
285
            metadata = CommitSupplement()
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
286
            metadata.verifiers = verifiers
0.252.8 by Jelmer Vernooij
Support ghost revisions while roundtripping.
287
        else:
288
            metadata = None
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
289
        parents = []
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
290
        for p in rev.parent_ids:
0.200.705 by Jelmer Vernooij
Cope with imports.
291
            try:
292
                git_p = parent_lookup(p)
293
            except KeyError:
294
                git_p = None
0.252.8 by Jelmer Vernooij
Support ghost revisions while roundtripping.
295
                if metadata is not None:
296
                    metadata.explicit_parent_ids = rev.parent_ids
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
297
            if git_p is not None:
0.361.1 by Jelmer Vernooij
Don't use assert.
298
                if len(git_p) != 40:
299
                    raise AssertionError("unexpected length for %r" % git_p)
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
300
                parents.append(git_p)
301
        commit.parents = parents
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
302
        try:
6973.12.9 by Jelmer Vernooij
More fixes.
303
            encoding = rev.properties[u'git-explicit-encoding']
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
304
        except KeyError:
6973.12.9 by Jelmer Vernooij
More fixes.
305
            encoding = rev.properties.get(u'git-implicit-encoding', 'utf-8')
0.320.3 by Jelmer Vernooij
Support gpg signatures.
306
        try:
7143.15.2 by Jelmer Vernooij
Run autopep8.
307
            commit.encoding = rev.properties[u'git-explicit-encoding'].encode(
308
                'ascii')
0.320.3 by Jelmer Vernooij
Support gpg signatures.
309
        except KeyError:
310
            pass
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
311
        commit.committer = fix_person_identifier(rev.committer.encode(
312
            encoding))
313
        commit.author = fix_person_identifier(
314
            rev.get_apparent_authors()[0].encode(encoding))
7018.3.2 by Jelmer Vernooij
Fix some git tests.
315
        # TODO(jelmer): Don't use this hack.
316
        long = getattr(__builtins__, 'long', int)
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
317
        commit.commit_time = long(rev.timestamp)
6973.12.9 by Jelmer Vernooij
More fixes.
318
        if u'author-timestamp' in rev.properties:
319
            commit.author_time = long(rev.properties[u'author-timestamp'])
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
320
        else:
321
            commit.author_time = commit.commit_time
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
322
        commit._commit_timezone_neg_utc = (
323
            u"commit-timezone-neg-utc" in rev.properties)
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
324
        commit.commit_timezone = rev.timezone
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
325
        commit._author_timezone_neg_utc = (
326
            u"author-timezone-neg-utc" in rev.properties)
6973.12.9 by Jelmer Vernooij
More fixes.
327
        if u'author-timezone' in rev.properties:
328
            commit.author_timezone = int(rev.properties[u'author-timezone'])
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
329
        else:
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
330
            commit.author_timezone = commit.commit_timezone
6973.12.9 by Jelmer Vernooij
More fixes.
331
        if u'git-gpg-signature' in rev.properties:
7143.15.2 by Jelmer Vernooij
Run autopep8.
332
            commit.gpgsig = rev.properties[u'git-gpg-signature'].encode(
333
                'ascii')
0.200.1636 by Jelmer Vernooij
Some formatting fixes.
334
        commit.message = self._encode_commit_message(rev, rev.message,
7143.15.2 by Jelmer Vernooij
Run autopep8.
335
                                                     encoding)
6973.13.2 by Jelmer Vernooij
Fix some more tests.
336
        if not isinstance(commit.message, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
337
            raise TypeError(commit.message)
0.252.8 by Jelmer Vernooij
Support ghost revisions while roundtripping.
338
        if metadata is not None:
0.252.4 by Jelmer Vernooij
More work on roundtripping.
339
            try:
340
                mapping_registry.parse_revision_id(rev.revision_id)
341
            except errors.InvalidRevisionId:
342
                metadata.revision_id = rev.revision_id
0.252.10 by Jelmer Vernooij
Support roundtripping custom revision properties.
343
            mapping_properties = set(
6973.12.9 by Jelmer Vernooij
More fixes.
344
                [u'author', u'author-timezone', u'author-timezone-neg-utc',
345
                 u'commit-timezone-neg-utc', u'git-implicit-encoding',
346
                 u'git-gpg-signature', u'git-explicit-encoding',
347
                 u'author-timestamp', u'file-modes'])
7018.3.2 by Jelmer Vernooij
Fix some git tests.
348
            for k, v in viewitems(rev.properties):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
349
                if k not in mapping_properties:
0.252.10 by Jelmer Vernooij
Support roundtripping custom revision properties.
350
                    metadata.properties[k] = v
0.320.3 by Jelmer Vernooij
Support gpg signatures.
351
        if not lossy and metadata:
0.200.1510 by Jelmer Vernooij
Fix tests.
352
            if self.roundtripping:
0.200.1636 by Jelmer Vernooij
Some formatting fixes.
353
                commit.message = inject_bzr_metadata(commit.message, metadata,
0.200.1510 by Jelmer Vernooij
Fix tests.
354
                                                     encoding)
355
            else:
7143.15.2 by Jelmer Vernooij
Run autopep8.
356
                raise NoPushSupport(
357
                    None, None, self, revision_id=rev.revision_id)
6973.13.2 by Jelmer Vernooij
Fix some more tests.
358
        if not isinstance(commit.message, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
359
            raise TypeError(commit.message)
0.413.2 by Jelmer Vernooij
Add support for the mergetag property in git.
360
        i = 0
6973.12.9 by Jelmer Vernooij
More fixes.
361
        propname = u'git-mergetag-0'
0.413.2 by Jelmer Vernooij
Add support for the mergetag property in git.
362
        while propname in rev.properties:
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
363
            commit.mergetag.append(Tag.from_string(rev.properties[propname]))
0.413.2 by Jelmer Vernooij
Add support for the mergetag property in git.
364
            i += 1
6973.12.9 by Jelmer Vernooij
More fixes.
365
            propname = u'git-mergetag-%d' % i
366
        if u'git-extra' in rev.properties:
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
367
            commit.extra.extend(
368
                [l.split(b' ', 1)
369
                 for l in rev.properties[u'git-extra'].splitlines()])
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
370
        return commit
371
0.252.22 by Jelmer Vernooij
Fix file id map (de)serialization.
372
    def import_fileid_map(self, blob):
373
        """Convert a git file id map blob.
374
375
        :param blob: Git blob object with fileid map
376
        :return: Dictionary mapping paths to file ids
377
        """
0.252.35 by Jelmer Vernooij
Ignore control files in inventories.
378
        return deserialize_fileid_map(blob.data)
0.252.22 by Jelmer Vernooij
Fix file id map (de)serialization.
379
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
380
    def import_commit(self, commit, lookup_parent_revid):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
381
        """Convert a git commit to a bzr revision.
382
0.200.1646 by Jelmer Vernooij
Rename bzrlib to breezy.
383
        :return: a `breezy.revision.Revision` object, foreign revid and a
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
384
            testament sha1
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
385
        """
386
        if commit is None:
387
            raise AssertionError("Commit object can't be None")
0.200.826 by Jelmer Vernooij
Fix some long lines.
388
        rev = ForeignRevision(commit.id, self,
7143.15.2 by Jelmer Vernooij
Run autopep8.
389
                              self.revision_id_foreign_to_bzr(commit.id))
0.252.4 by Jelmer Vernooij
More work on roundtripping.
390
        rev.git_metadata = None
7143.15.2 by Jelmer Vernooij
Run autopep8.
391
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
392
        def decode_using_encoding(rev, commit, encoding):
7018.3.2 by Jelmer Vernooij
Fix some git tests.
393
            rev.committer = commit.committer.decode(encoding)
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
394
            if commit.committer != commit.author:
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
395
                rev.properties[u'author'] = commit.author.decode(encoding)
0.252.4 by Jelmer Vernooij
More work on roundtripping.
396
            rev.message, rev.git_metadata = self._decode_commit_message(
397
                rev, commit.message, encoding)
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
398
        if commit.encoding is not None:
7143.15.2 by Jelmer Vernooij
Run autopep8.
399
            rev.properties[u'git-explicit-encoding'] = commit.encoding.decode(
400
                'ascii')
7018.3.2 by Jelmer Vernooij
Fix some git tests.
401
            decode_using_encoding(rev, commit, commit.encoding.decode('ascii'))
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
402
        else:
403
            for encoding in ('utf-8', 'latin1'):
404
                try:
405
                    decode_using_encoding(rev, commit, encoding)
406
                except UnicodeDecodeError:
407
                    pass
408
                else:
409
                    if encoding != 'utf-8':
6973.12.9 by Jelmer Vernooij
More fixes.
410
                        rev.properties[u'git-implicit-encoding'] = encoding
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
411
                    break
0.200.350 by Jelmer Vernooij
Support author_time
412
        if commit.commit_time != commit.author_time:
6973.12.9 by Jelmer Vernooij
More fixes.
413
            rev.properties[u'author-timestamp'] = str(commit.author_time)
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
414
        if commit.commit_timezone != commit.author_timezone:
6973.12.9 by Jelmer Vernooij
More fixes.
415
            rev.properties[u'author-timezone'] = "%d" % commit.author_timezone
0.200.884 by Jelmer Vernooij
Cope with -0000 as timezone in Git commits.
416
        if commit._author_timezone_neg_utc:
6973.12.9 by Jelmer Vernooij
More fixes.
417
            rev.properties[u'author-timezone-neg-utc'] = ""
0.200.884 by Jelmer Vernooij
Cope with -0000 as timezone in Git commits.
418
        if commit._commit_timezone_neg_utc:
6973.12.9 by Jelmer Vernooij
More fixes.
419
            rev.properties[u'commit-timezone-neg-utc'] = ""
0.320.3 by Jelmer Vernooij
Support gpg signatures.
420
        if commit.gpgsig:
7143.15.2 by Jelmer Vernooij
Run autopep8.
421
            rev.properties[u'git-gpg-signature'] = commit.gpgsig.decode(
422
                'ascii')
0.413.1 by Jelmer Vernooij
Raise AssertionError upon encountering mergetag.
423
        if commit.mergetag:
0.413.2 by Jelmer Vernooij
Add support for the mergetag property in git.
424
            for i, tag in enumerate(commit.mergetag):
6973.12.9 by Jelmer Vernooij
More fixes.
425
                rev.properties[u'git-mergetag-%d' % i] = tag.as_raw_string()
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
426
        rev.timestamp = commit.commit_time
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
427
        rev.timezone = commit.commit_timezone
0.261.5 by Jelmer Vernooij
Fix looking up of parents during fetch.
428
        rev.parent_ids = None
0.252.4 by Jelmer Vernooij
More work on roundtripping.
429
        if rev.git_metadata is not None:
0.252.6 by Jelmer Vernooij
Roundtripping support for revision ids works.
430
            md = rev.git_metadata
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
431
            roundtrip_revid = md.revision_id
0.252.8 by Jelmer Vernooij
Support ghost revisions while roundtripping.
432
            if md.explicit_parent_ids:
433
                rev.parent_ids = md.explicit_parent_ids
0.252.10 by Jelmer Vernooij
Support roundtripping custom revision properties.
434
            rev.properties.update(md.properties)
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
435
            verifiers = md.verifiers
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
436
        else:
437
            roundtrip_revid = None
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
438
            verifiers = {}
0.261.5 by Jelmer Vernooij
Fix looking up of parents during fetch.
439
        if rev.parent_ids is None:
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
440
            parents = []
441
            for p in commit.parents:
442
                try:
443
                    parents.append(lookup_parent_revid(p))
444
                except KeyError:
445
                    parents.append(self.revision_id_foreign_to_bzr(p))
7096.3.2 by Jelmer Vernooij
Fix some git tests.
446
            rev.parent_ids = list(parents)
0.200.1639 by Jelmer Vernooij
Properly roundtrip HG:rename-source fields.
447
        unknown_extra_fields = []
448
        extra_lines = []
449
        for k, v in commit.extra:
450
            if k == HG_RENAME_SOURCE:
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
451
                extra_lines.append(k + b' ' + v + b'\n')
0.200.1640 by Jelmer Vernooij
Support HG extra 'amend_source'.
452
            elif k == HG_EXTRA:
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
453
                hgk, hgv = v.split(b':', 1)
0.200.1640 by Jelmer Vernooij
Support HG extra 'amend_source'.
454
                if hgk not in (HG_EXTRA_AMEND_SOURCE, ):
455
                    raise UnknownMercurialCommitExtra(commit, hgk)
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
456
                extra_lines.append(k + b' ' + v + b'\n')
0.200.1639 by Jelmer Vernooij
Properly roundtrip HG:rename-source fields.
457
            else:
458
                unknown_extra_fields.append(k)
459
        if unknown_extra_fields:
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
460
            raise UnknownCommitExtra(
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
461
                commit,
462
                [f.decode('ascii', 'replace') for f in unknown_extra_fields])
0.200.1639 by Jelmer Vernooij
Properly roundtrip HG:rename-source fields.
463
        if extra_lines:
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
464
            rev.properties[u'git-extra'] = b''.join(extra_lines)
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
465
        return rev, roundtrip_revid, verifiers
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
466
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
467
    def get_fileid_map(self, lookup_object, tree_sha):
468
        """Obtain a fileid map for a particular tree.
469
470
        :param lookup_object: Function for looking up an object
471
        :param tree_sha: SHA of the root tree
472
        :return: GitFileIdMap instance
473
        """
474
        try:
7143.15.2 by Jelmer Vernooij
Run autopep8.
475
            file_id_map_sha = lookup_object(
476
                tree_sha)[self.BZR_FILE_IDS_FILE][1]
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
477
        except KeyError:
478
            file_ids = {}
479
        else:
480
            file_ids = self.import_fileid_map(lookup_object(file_id_map_sha))
481
        return GitFileIdMap(file_ids, self)
482
0.200.97 by Jelmer Vernooij
use mapping object.
483
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
484
class BzrGitMappingv1(BzrGitMapping):
7018.3.2 by Jelmer Vernooij
Fix some git tests.
485
    revid_prefix = b'git-v1'
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
486
    experimental = False
487
0.200.393 by Jelmer Vernooij
Provide __str__ implementation for mapping, fix docstring for ForeignGit.
488
    def __str__(self):
489
        return self.revid_prefix
490
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
491
492
class BzrGitMappingExperimental(BzrGitMappingv1):
7018.3.2 by Jelmer Vernooij
Fix some git tests.
493
    revid_prefix = b'git-experimental'
0.200.104 by Jelmer Vernooij
Use bzr-foreign function names for converting between git and bzr revids.
494
    experimental = True
0.200.912 by Jelmer Vernooij
Merge roundtrip support.
495
    roundtripping = True
0.200.97 by Jelmer Vernooij
use mapping object.
496
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
497
    BZR_FILE_IDS_FILE = '.bzrfileids'
498
499
    BZR_DUMMY_FILE = '.bzrdummy'
500
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
501
    def _decode_commit_message(self, rev, message, encoding):
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
502
        message = self._extract_hg_metadata(rev, message)
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
503
        message = self._extract_git_svn_metadata(rev, message)
0.252.4 by Jelmer Vernooij
More work on roundtripping.
504
        message, metadata = self._extract_bzr_metadata(rev, message)
505
        return message.decode(encoding), metadata
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
506
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
507
    def _encode_commit_message(self, rev, message, encoding):
508
        ret = message.encode(encoding)
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
509
        ret += self._generate_hg_message_tail(rev)
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
510
        ret += self._generate_git_svn_metadata(rev, encoding)
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
511
        return ret
512
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
513
    def import_commit(self, commit, lookup_parent_revid):
7143.15.2 by Jelmer Vernooij
Run autopep8.
514
        rev, roundtrip_revid, verifiers = super(
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
515
            BzrGitMappingExperimental, self).import_commit(
516
                commit, lookup_parent_revid)
6973.12.9 by Jelmer Vernooij
More fixes.
517
        rev.properties[u'converted_revision'] = "git %s\n" % commit.id
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
518
        return rev, roundtrip_revid, verifiers
0.200.642 by Jelmer Vernooij
In experimental mappings, set 'converted_revision' property.
519
0.200.97 by Jelmer Vernooij
use mapping object.
520
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
521
class GitMappingRegistry(VcsMappingRegistry):
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
522
    """Registry with available git mappings."""
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
523
524
    def revision_id_bzr_to_foreign(self, bzr_revid):
0.200.701 by Jelmer Vernooij
Fix check in git repos.
525
        if bzr_revid == NULL_REVISION:
0.200.892 by Jelmer Vernooij
Lazy import ZERO_SHA.
526
            from dulwich.protocol import ZERO_SHA
0.200.891 by Jelmer Vernooij
Use ZERO_SHA constant where possible.
527
            return ZERO_SHA, None
6973.13.2 by Jelmer Vernooij
Fix some more tests.
528
        if not bzr_revid.startswith(b"git-"):
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
529
            raise errors.InvalidRevisionId(bzr_revid, None)
6973.13.2 by Jelmer Vernooij
Fix some more tests.
530
        (mapping_version, git_sha) = bzr_revid.split(b":", 1)
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
531
        mapping = self.get(mapping_version)
532
        return mapping.revision_id_bzr_to_foreign(bzr_revid)
533
534
    parse_revision_id = revision_id_bzr_to_foreign
535
536
537
mapping_registry = GitMappingRegistry()
6986.2.3 by Jelmer Vernooij
Merge trunk
538
mapping_registry.register_lazy(b'git-v1', __name__,
7143.15.2 by Jelmer Vernooij
Run autopep8.
539
                               "BzrGitMappingv1")
7018.3.2 by Jelmer Vernooij
Fix some git tests.
540
mapping_registry.register_lazy(b'git-experimental',
7143.15.2 by Jelmer Vernooij
Run autopep8.
541
                               __name__, "BzrGitMappingExperimental")
0.200.1507 by Jelmer Vernooij
Add note on experimental mapping format.
542
# Uncomment the next line to enable the experimental bzr-git mappings.
543
# This will make sure all bzr metadata is pushed into git, allowing for
544
# full roundtripping later.
545
# NOTE: THIS IS EXPERIMENTAL. IT MAY EAT YOUR DATA OR CORRUPT
546
# YOUR BZR OR GIT REPOSITORIES. USE WITH CARE.
7143.15.2 by Jelmer Vernooij
Run autopep8.
547
# mapping_registry.set_default('git-experimental')
7018.3.2 by Jelmer Vernooij
Fix some git tests.
548
mapping_registry.set_default(b'git-v1')
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
549
550
551
class ForeignGit(ForeignVcs):
0.200.393 by Jelmer Vernooij
Provide __str__ implementation for mapping, fix docstring for ForeignGit.
552
    """The Git Stupid Content Tracker"""
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
553
0.243.1 by Jelmer Vernooij
Use foreign branch testing infrastructure.
554
    @property
555
    def branch_format(self):
0.295.1 by Jelmer Vernooij
Split up branch formats.
556
        from .branch import LocalGitBranchFormat
557
        return LocalGitBranchFormat()
0.243.1 by Jelmer Vernooij
Use foreign branch testing infrastructure.
558
0.200.657 by Jelmer Vernooij
Provide repository_format attribute, as required by newer foreign VCS tests in bzrlib.
559
    @property
560
    def repository_format(self):
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
561
        from .repository import GitRepositoryFormat
0.200.657 by Jelmer Vernooij
Provide repository_format attribute, as required by newer foreign VCS tests in bzrlib.
562
        return GitRepositoryFormat()
563
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
564
    def __init__(self):
565
        super(ForeignGit, self).__init__(mapping_registry)
0.200.646 by Jelmer Vernooij
Store abbreviation in foreign branch.
566
        self.abbreviation = "git"
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
567
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
568
    @classmethod
0.200.652 by Jelmer Vernooij
Split out git-svn-id parser as separate function, implement ForeignGit.serialize_foreign_revid.
569
    def serialize_foreign_revid(self, foreign_revid):
570
        return foreign_revid
571
572
    @classmethod
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
573
    def show_foreign_revid(cls, foreign_revid):
7143.15.2 by Jelmer Vernooij
Run autopep8.
574
        return {"git commit": foreign_revid.decode('utf-8')}
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
575
576
0.200.1263 by Jelmer Vernooij
Fix foreign_vcs_git.
577
foreign_vcs_git = ForeignGit()
0.200.637 by Jelmer Vernooij
Allow single place for configuration of default mapping.
578
default_mapping = mapping_registry.get_default()()
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
579
580
0.275.1 by Jelmer Vernooij
Use root_inventory.
581
def symlink_to_blob(symlink_target):
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
582
    from dulwich.objects import Blob
583
    blob = Blob()
6973.6.2 by Jelmer Vernooij
Fix more tests.
584
    if isinstance(symlink_target, text_type):
0.200.795 by Jelmer Vernooij
simplify sha extraction for blobs, process multiple blobs at once.
585
        symlink_target = symlink_target.encode('utf-8')
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
586
    blob.data = symlink_target
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
587
    return blob
588
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
589
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
590
def mode_is_executable(mode):
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
591
    """Check if mode should be considered executable."""
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
592
    return bool(mode & 0o111)
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
593
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
594
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
595
def mode_kind(mode):
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
596
    """Determine the Bazaar inventory kind based on Unix file mode."""
0.200.1538 by Jelmer Vernooij
More work on tree-reference support.
597
    if mode is None:
598
        return None
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
599
    entry_kind = (mode & 0o700000) / 0o100000
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
600
    if entry_kind == 0:
601
        return 'directory'
602
    elif entry_kind == 1:
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
603
        file_kind = (mode & 0o70000) / 0o10000
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
604
        if file_kind == 0:
605
            return 'file'
606
        elif file_kind == 2:
607
            return 'symlink'
608
        elif file_kind == 6:
609
            return 'tree-reference'
610
        else:
611
            raise AssertionError(
612
                "Unknown file kind %d, perms=%o." % (file_kind, mode,))
613
    else:
614
        raise AssertionError(
615
            "Unknown kind, perms=%r." % (mode,))
616
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
617
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
618
def object_mode(kind, executable):
619
    if kind == 'directory':
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
620
        return stat.S_IFDIR
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
621
    elif kind == 'symlink':
0.245.1 by INADA Naoki
Handle executable mode for symlink.
622
        mode = stat.S_IFLNK
623
        if executable:
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
624
            mode |= 0o111
0.245.1 by INADA Naoki
Handle executable mode for symlink.
625
        return mode
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
626
    elif kind == 'file':
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
627
        mode = stat.S_IFREG | 0o644
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
628
        if executable:
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
629
            mode |= 0o111
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
630
        return mode
0.200.665 by Jelmer Vernooij
Add more checks for submodules.
631
    elif kind == 'tree-reference':
632
        from dulwich.objects import S_IFGITLINK
633
        return S_IFGITLINK
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
634
    else:
635
        raise AssertionError
636
637
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
638
def entry_mode(entry):
639
    """Determine the git file mode for an inventory entry."""
0.429.17 by Jelmer Vernooij
Fix some more tests.
640
    return object_mode(entry.kind, getattr(entry, 'executable', False))
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
641
642
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
643
def extract_unusual_modes(rev):
644
    try:
0.200.826 by Jelmer Vernooij
Fix some long lines.
645
        foreign_revid, mapping = mapping_registry.parse_revision_id(
646
            rev.revision_id)
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
647
    except errors.InvalidRevisionId:
648
        return {}
649
    else:
650
        return mapping.export_unusual_file_modes(rev)
651
652
0.200.652 by Jelmer Vernooij
Split out git-svn-id parser as separate function, implement ForeignGit.serialize_foreign_revid.
653
def parse_git_svn_id(text):
654
    (head, uuid) = text.rsplit(" ", 1)
655
    (full_url, rev) = head.rsplit("@", 1)
0.200.653 by Jelmer Vernooij
Fix typo in git-svn-id parser, return revnum as integer.
656
    return (full_url, int(rev), uuid)
0.252.33 by Jelmer Vernooij
Fix file id map lookups.
657
658
659
class GitFileIdMap(object):
660
661
    def __init__(self, file_ids, mapping):
662
        self.file_ids = file_ids
663
        self.paths = None
664
        self.mapping = mapping
665
0.200.1569 by Jelmer Vernooij
Implement GitRevisionTree.all_file_ids().
666
    def all_file_ids(self):
667
        return self.file_ids.values()
668
0.200.1201 by Jelmer Vernooij
Implement _set_root_id.
669
    def set_file_id(self, path, file_id):
0.361.1 by Jelmer Vernooij
Don't use assert.
670
        if type(path) is not str:
671
            raise TypeError(path)
6973.13.2 by Jelmer Vernooij
Fix some more tests.
672
        if not isinstance(file_id, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
673
            raise TypeError(file_id)
0.200.1201 by Jelmer Vernooij
Implement _set_root_id.
674
        self.file_ids[path] = file_id
675
0.252.33 by Jelmer Vernooij
Fix file id map lookups.
676
    def lookup_file_id(self, path):
7018.3.2 by Jelmer Vernooij
Fix some git tests.
677
        if not isinstance(path, text_type):
0.361.1 by Jelmer Vernooij
Don't use assert.
678
            raise TypeError(path)
0.252.33 by Jelmer Vernooij
Fix file id map lookups.
679
        try:
0.200.973 by Jelmer Vernooij
Add tests for generate_file_id.
680
            file_id = self.file_ids[path]
0.252.33 by Jelmer Vernooij
Fix file id map lookups.
681
        except KeyError:
0.200.973 by Jelmer Vernooij
Add tests for generate_file_id.
682
            file_id = self.mapping.generate_file_id(path)
6973.13.2 by Jelmer Vernooij
Fix some more tests.
683
        if not isinstance(file_id, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
684
            raise TypeError(file_id)
0.200.973 by Jelmer Vernooij
Add tests for generate_file_id.
685
        return file_id
0.252.33 by Jelmer Vernooij
Fix file id map lookups.
686
687
    def lookup_path(self, file_id):
688
        if self.paths is None:
689
            self.paths = {}
7018.3.2 by Jelmer Vernooij
Fix some git tests.
690
            for k, v in viewitems(self.file_ids):
0.252.33 by Jelmer Vernooij
Fix file id map lookups.
691
                self.paths[v] = k
692
        try:
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
693
            path = self.paths[file_id]
0.252.33 by Jelmer Vernooij
Fix file id map lookups.
694
        except KeyError:
695
            return self.mapping.parse_file_id(file_id)
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
696
        else:
7018.3.2 by Jelmer Vernooij
Fix some git tests.
697
            if not isinstance(path, text_type):
0.361.1 by Jelmer Vernooij
Don't use assert.
698
                raise TypeError(path)
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
699
            return path
0.200.1202 by Jelmer Vernooij
Implement has_or_had_id.
700
701
    def copy(self):
702
        return self.__class__(dict(self.file_ids), self.mapping)
0.320.2 by Jelmer Vernooij
Only complain about roundtripping if revisions being pushed didn't originally come from git.
703
704
705
def needs_roundtripping(repo, revid):
706
    try:
707
        mapping_registry.parse_revision_id(revid)
708
    except errors.InvalidRevisionId:
709
        return True
710
    else:
711
        return False