/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.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
21
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.
22
import stat
23
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
24
from .. import (
0.200.926 by Jelmer Vernooij
Fix formatting, drop support for Bazaar < 2.0.
25
    bencode,
0.200.292 by Jelmer Vernooij
Fix formatting.
26
    errors,
27
    foreign,
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
28
    trace,
7018.3.2 by Jelmer Vernooij
Fix some git tests.
29
    urlutils,
0.200.292 by Jelmer Vernooij
Fix formatting.
30
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
31
from ..foreign import (
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
32
    ForeignVcs,
33
    VcsMappingRegistry,
0.200.292 by Jelmer Vernooij
Fix formatting.
34
    ForeignRevision,
35
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
36
from ..revision import (
0.200.701 by Jelmer Vernooij
Fix check in git repos.
37
    NULL_REVISION,
7268.1.2 by Jelmer Vernooij
Allow access to native git repositories, ignoring unknown hg fields.
38
    Revision,
0.200.701 by Jelmer Vernooij
Fix check in git repos.
39
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
40
from .errors import (
0.200.1598 by Jelmer Vernooij
Print proper error when unknown fields are encountered.
41
    NoPushSupport,
42
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
43
from .hg import (
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
44
    format_hg_metadata,
45
    extract_hg_metadata,
46
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
47
from .roundtrip import (
0.252.2 by Jelmer Vernooij
Add functions for adding metadata to revision messages.
48
    extract_bzr_metadata,
0.252.4 by Jelmer Vernooij
More work on roundtripping.
49
    inject_bzr_metadata,
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
50
    CommitSupplement,
0.252.2 by Jelmer Vernooij
Add functions for adding metadata to revision messages.
51
    )
0.200.309 by Jelmer Vernooij
Add XML escaping to work around serialization bug in bzr.
52
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
53
54
DEFAULT_FILE_MODE = stat.S_IFREG | 0o644
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
55
HG_RENAME_SOURCE = b"HG:rename-source"
56
HG_EXTRA = b"HG:extra"
0.200.1640 by Jelmer Vernooij
Support HG extra 'amend_source'.
57
58
# 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.
59
HG_EXTRA_AMEND_SOURCE = b"amend_source"
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
60
0.200.1712 by Jelmer Vernooij
Add file_id prefix.
61
FILE_ID_PREFIX = b'git:'
62
7143.7.1 by Jelmer Vernooij
Simplify brz-git, drop imports.
63
# Always the same.
64
ROOT_ID = b"TREE_ROOT"
65
0.206.1 by Jelmer Vernooij
Use foreign utility functions.
66
7410.2.1 by Jelmer Vernooij
Allow unknown extras in git commits when just inspecting revisions, rather than importing.
67
class UnknownCommitExtra(errors.BzrError):
68
    _fmt = "Unknown extra fields in %(object)r: %(fields)r."
69
70
    def __init__(self, object, fields):
71
        errors.BzrError.__init__(self)
72
        self.object = object
73
        self.fields = ",".join(fields)
74
75
76
class UnknownMercurialCommitExtra(errors.BzrError):
77
    _fmt = "Unknown mercurial extra fields in %(object)r: %(fields)r."
78
79
    def __init__(self, object, fields):
80
        errors.BzrError.__init__(self)
81
        self.object = object
82
        self.fields = b",".join(fields)
83
84
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
85
def escape_file_id(file_id):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
86
    file_id = file_id.replace(b'_', b'__')
87
    file_id = file_id.replace(b' ', b'_s')
88
    file_id = file_id.replace(b'\x0c', b'_c')
89
    return file_id
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
90
91
92
def unescape_file_id(file_id):
7018.3.6 by Jelmer Vernooij
Fix unescape tests.
93
    ret = bytearray()
0.200.390 by Jelmer Vernooij
Fix file id unescape function when there are other underscores in the file id.
94
    i = 0
95
    while i < len(file_id):
7143.15.2 by Jelmer Vernooij
Run autopep8.
96
        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.
97
            ret.append(file_id[i])
98
        else:
7143.15.2 by Jelmer Vernooij
Run autopep8.
99
            if file_id[i + 1:i + 2] == b'_':
7018.3.6 by Jelmer Vernooij
Fix unescape tests.
100
                ret.append(b"_"[0])
7143.15.2 by Jelmer Vernooij
Run autopep8.
101
            elif file_id[i + 1:i + 2] == b's':
7018.3.6 by Jelmer Vernooij
Fix unescape tests.
102
                ret.append(b" "[0])
7143.15.2 by Jelmer Vernooij
Run autopep8.
103
            elif file_id[i + 1:i + 2] == b'c':
7018.3.6 by Jelmer Vernooij
Fix unescape tests.
104
                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.
105
            else:
0.200.1712 by Jelmer Vernooij
Add file_id prefix.
106
                raise ValueError("unknown escape character %s" %
7143.15.2 by Jelmer Vernooij
Run autopep8.
107
                                 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.
108
            i += 1
109
        i += 1
7018.3.6 by Jelmer Vernooij
Fix unescape tests.
110
    return bytes(ret)
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
111
112
0.200.376 by Jelmer Vernooij
Make sure author and committer names pushed to git contain < and >, otherwise the git parser barfs.
113
def fix_person_identifier(text):
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
114
    if b"<" not in text and b">" not in text:
0.402.1 by Jelmer Vernooij
Improve identifier handling.
115
        username = text
116
        email = text
7490.41.1 by Jelmer Vernooij
Fix handling of a particular kind of broken committer id.
117
    elif b">" not in text:
118
        return text + b">"
0.402.1 by Jelmer Vernooij
Improve identifier handling.
119
    else:
6973.13.2 by Jelmer Vernooij
Fix some more tests.
120
        if text.rindex(b">") < text.rindex(b"<"):
0.402.1 by Jelmer Vernooij
Improve identifier handling.
121
            raise ValueError(text)
6973.13.2 by Jelmer Vernooij
Fix some more tests.
122
        username, email = text.split(b"<", 2)[-2:]
123
        email = email.split(b">", 1)[0]
124
        if username.endswith(b" "):
0.402.1 by Jelmer Vernooij
Improve identifier handling.
125
            username = username[:-1]
6973.13.2 by Jelmer Vernooij
Fix some more tests.
126
    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.
127
128
7490.70.1 by Jelmer Vernooij
Add functions for encoding/decoding git paths.
129
def decode_git_path(path):
130
    """Take a git path and decode it."""
7490.76.1 by Jelmer Vernooij
Support non-utf-8 characters in Git repositories by surrogate-escaping them.
131
    try:
132
        return path.decode('utf-8')
133
    except UnicodeDecodeError:
134
        if PY3:
135
            return path.decode('utf-8', 'surrogateescape')
136
        raise
7490.70.1 by Jelmer Vernooij
Add functions for encoding/decoding git paths.
137
138
139
def encode_git_path(path):
140
    """Take a regular path and encode it for git."""
7490.76.1 by Jelmer Vernooij
Support non-utf-8 characters in Git repositories by surrogate-escaping them.
141
    try:
142
        return path.encode('utf-8')
143
    except UnicodeEncodeError:
144
        if PY3:
145
            return path.encode('utf-8', 'surrogateescape')
146
        raise
7490.70.1 by Jelmer Vernooij
Add functions for encoding/decoding git paths.
147
148
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
149
def warn_escaped(commit, num_escaped):
150
    trace.warning("Escaped %d XML-invalid characters in %s. Will be unable "
151
                  "to regenerate the SHA map.", num_escaped, commit)
152
153
154
def warn_unusual_mode(commit, path, mode):
0.200.826 by Jelmer Vernooij
Fix some long lines.
155
    trace.mutter("Unusual file mode %o for %s in %s. Storing as revision "
156
                 "property. ", mode, path, commit)
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
157
158
0.206.1 by Jelmer Vernooij
Use foreign utility functions.
159
class BzrGitMapping(foreign.VcsMapping):
0.200.97 by Jelmer Vernooij
use mapping object.
160
    """Class that maps between Git and Bazaar semantics."""
161
    experimental = False
162
7490.130.1 by Jelmer Vernooij
Rename bzr to brz in a few more places.
163
    BZR_DUMMY_FILE = None  # type: Optional[str]
0.252.26 by Jelmer Vernooij
Add is_control_file method to BzrGitMapping.
164
0.200.1328 by Jelmer Vernooij
More test fixes.
165
    def is_special_file(self, filename):
7358.13.1 by Jelmer Vernooij
Drop file id roundtripping support in Git.
166
        return (filename in (self.BZR_DUMMY_FILE, ))
0.200.1328 by Jelmer Vernooij
More test fixes.
167
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
168
    def __init__(self):
0.200.1263 by Jelmer Vernooij
Fix foreign_vcs_git.
169
        super(BzrGitMapping, self).__init__(foreign_vcs_git)
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
170
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
171
    def __eq__(self, other):
7143.15.2 by Jelmer Vernooij
Run autopep8.
172
        return (type(self) == type(other)
173
                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.
174
175
    @classmethod
176
    def revision_id_foreign_to_bzr(cls, git_rev_id):
0.200.97 by Jelmer Vernooij
use mapping object.
177
        """Convert a git revision id handle to a Bazaar revision id."""
0.200.891 by Jelmer Vernooij
Use ZERO_SHA constant where possible.
178
        from dulwich.protocol import ZERO_SHA
179
        if git_rev_id == ZERO_SHA:
0.200.769 by Jelmer Vernooij
Cope with open_branch() actually checking whether there is a branch present.
180
            return NULL_REVISION
7018.3.2 by Jelmer Vernooij
Fix some git tests.
181
        return b"%s:%s" % (cls.revid_prefix, git_rev_id)
0.200.97 by Jelmer Vernooij
use mapping object.
182
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
183
    @classmethod
184
    def revision_id_bzr_to_foreign(cls, bzr_rev_id):
0.200.97 by Jelmer Vernooij
use mapping object.
185
        """Convert a Bazaar revision id to a git revision id handle."""
7018.3.2 by Jelmer Vernooij
Fix some git tests.
186
        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.
187
            raise errors.InvalidRevisionId(bzr_rev_id, cls)
7143.15.2 by Jelmer Vernooij
Run autopep8.
188
        return bzr_rev_id[len(cls.revid_prefix) + 1:], cls()
0.200.97 by Jelmer Vernooij
use mapping object.
189
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
190
    def generate_file_id(self, path):
0.200.297 by Jelmer Vernooij
Cope with non-ascii characters in filenames (needs a test..).
191
        # Git paths are just bytestrings
192
        # We must just hope they are valid UTF-8..
7479.2.1 by Jelmer Vernooij
Drop python2 support.
193
        if isinstance(path, str):
0.200.973 by Jelmer Vernooij
Add tests for generate_file_id.
194
            path = path.encode("utf-8")
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
195
        if path == b"":
196
            return ROOT_ID
0.200.1712 by Jelmer Vernooij
Add file_id prefix.
197
        return FILE_ID_PREFIX + escape_file_id(path)
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
198
0.230.2 by Jelmer Vernooij
Fix versionedfiles.
199
    def parse_file_id(self, file_id):
200
        if file_id == ROOT_ID:
7045.4.1 by Jelmer Vernooij
Some brz-git fixes.
201
            return u""
0.200.1712 by Jelmer Vernooij
Add file_id prefix.
202
        if not file_id.startswith(FILE_ID_PREFIX):
203
            raise ValueError
7490.70.1 by Jelmer Vernooij
Add functions for encoding/decoding git paths.
204
        return decode_git_path(unescape_file_id(file_id[len(FILE_ID_PREFIX):]))
0.252.31 by Jelmer Vernooij
Properly escape revids when using them in ref names.
205
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
206
    def import_unusual_file_modes(self, rev, unusual_file_modes):
207
        if unusual_file_modes:
0.200.878 by Jelmer Vernooij
Fix determining of unusual file modes.
208
            ret = [(path, unusual_file_modes[path])
209
                   for path in sorted(unusual_file_modes.keys())]
6973.12.9 by Jelmer Vernooij
More fixes.
210
            rev.properties[u'file-modes'] = bencode.bencode(ret)
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
211
0.200.547 by Jelmer Vernooij
Support getting unusual file modes out of revision properties.
212
    def export_unusual_file_modes(self, rev):
213
        try:
6973.12.9 by Jelmer Vernooij
More fixes.
214
            file_modes = rev.properties[u'file-modes']
0.200.547 by Jelmer Vernooij
Support getting unusual file modes out of revision properties.
215
        except KeyError:
216
            return {}
0.200.894 by Jelmer Vernooij
Simplify formatting a bit.
217
        else:
0.421.6 by Jelmer Vernooij
Some more simplifications.
218
            return dict(bencode.bdecode(file_modes.encode("utf-8")))
0.200.547 by Jelmer Vernooij
Support getting unusual file modes out of revision properties.
219
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
220
    def _generate_git_svn_metadata(self, rev, encoding):
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
221
        try:
6973.12.9 by Jelmer Vernooij
More fixes.
222
            git_svn_id = rev.properties[u"git-svn-id"]
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
223
        except KeyError:
224
            return ""
0.200.894 by Jelmer Vernooij
Simplify formatting a bit.
225
        else:
226
            return "\ngit-svn-id: %s\n" % git_svn_id.encode(encoding)
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
227
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
228
    def _generate_hg_message_tail(self, rev):
229
        extra = {}
230
        renames = []
0.200.639 by Jelmer Vernooij
Support renames in hg-git messages as well.
231
        branch = 'default'
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
232
        for name in rev.properties:
6973.12.9 by Jelmer Vernooij
More fixes.
233
            if name == u'hg:extra:branch':
234
                branch = rev.properties[u'hg:extra:branch']
235
            elif name.startswith(u'hg:extra'):
236
                extra[name[len(u'hg:extra:'):]] = base64.b64decode(
0.200.826 by Jelmer Vernooij
Fix some long lines.
237
                    rev.properties[name])
6973.12.9 by Jelmer Vernooij
More fixes.
238
            elif name == u'hg:renames':
0.200.826 by Jelmer Vernooij
Fix some long lines.
239
                renames = bencode.bdecode(base64.b64decode(
6973.12.9 by Jelmer Vernooij
More fixes.
240
                    rev.properties[u'hg:renames']))
0.200.639 by Jelmer Vernooij
Support renames in hg-git messages as well.
241
            # TODO: Export other properties as 'bzr:' extras?
0.200.660 by Jelmer Vernooij
Fix encoding issues.
242
        ret = format_hg_metadata(renames, branch, extra)
6973.13.2 by Jelmer Vernooij
Fix some more tests.
243
        if not isinstance(ret, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
244
            raise TypeError(ret)
0.200.660 by Jelmer Vernooij
Fix encoding issues.
245
        return ret
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
246
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
247
    def _extract_git_svn_metadata(self, rev, message):
248
        lines = message.split("\n")
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
249
        if not (lines[-1] == "" and len(lines) >= 2 and
250
                lines[-2].startswith("git-svn-id:")):
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
251
            return message
0.200.652 by Jelmer Vernooij
Split out git-svn-id parser as separate function, implement ForeignGit.serialize_foreign_revid.
252
        git_svn_id = lines[-2].split(": ", 1)[1]
6973.12.9 by Jelmer Vernooij
More fixes.
253
        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.
254
        (url, rev, uuid) = parse_git_svn_id(git_svn_id)
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
255
        # FIXME: Convert this to converted-from property somehow..
0.361.1 by Jelmer Vernooij
Don't use assert.
256
        return "\n".join(lines[:-2])
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
257
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
258
    def _extract_hg_metadata(self, rev, message):
259
        (message, renames, branch, extra) = extract_hg_metadata(message)
260
        if branch is not None:
6973.12.9 by Jelmer Vernooij
More fixes.
261
            rev.properties[u'hg:extra:branch'] = branch
7479.2.1 by Jelmer Vernooij
Drop python2 support.
262
        for name, value in extra.items():
6973.12.9 by Jelmer Vernooij
More fixes.
263
            rev.properties[u'hg:extra:' + name] = base64.b64encode(value)
0.200.639 by Jelmer Vernooij
Support renames in hg-git messages as well.
264
        if renames:
6973.12.9 by Jelmer Vernooij
More fixes.
265
            rev.properties[u'hg:renames'] = base64.b64encode(bencode.bencode(
7479.2.1 by Jelmer Vernooij
Drop python2 support.
266
                [(new, old) for (old, new) in renames.items()]))
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
267
        return message
268
0.252.2 by Jelmer Vernooij
Add functions for adding metadata to revision messages.
269
    def _extract_bzr_metadata(self, rev, message):
270
        (message, metadata) = extract_bzr_metadata(message)
0.252.4 by Jelmer Vernooij
More work on roundtripping.
271
        return message, metadata
0.252.2 by Jelmer Vernooij
Add functions for adding metadata to revision messages.
272
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
273
    def _decode_commit_message(self, rev, message, encoding):
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
274
        return message.decode(encoding), CommitSupplement()
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
275
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
276
    def _encode_commit_message(self, rev, message, encoding):
277
        return message.encode(encoding)
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
278
0.200.1509 by Jelmer Vernooij
Properly raise exception when pulling from git into bzr without experimental mappings.
279
    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.
280
                      verifiers):
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
281
        """Turn a Bazaar revision in to a Git commit
282
283
        :param tree_sha: Tree sha for the commit
0.200.826 by Jelmer Vernooij
Fix some long lines.
284
        :param parent_lookup: Function for looking up the GIT sha equiv of a
285
            bzr revision
0.200.1509 by Jelmer Vernooij
Properly raise exception when pulling from git into bzr without experimental mappings.
286
        :param lossy: Whether to store roundtripping information.
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
287
        :param verifiers: Verifiers info
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
288
        :return dulwich.objects.Commit represent the revision:
289
        """
0.413.2 by Jelmer Vernooij
Add support for the mergetag property in git.
290
        from dulwich.objects import Commit, Tag
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
291
        commit = Commit()
292
        commit.tree = tree_sha
0.200.1509 by Jelmer Vernooij
Properly raise exception when pulling from git into bzr without experimental mappings.
293
        if not lossy:
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
294
            metadata = CommitSupplement()
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
295
            metadata.verifiers = verifiers
0.252.8 by Jelmer Vernooij
Support ghost revisions while roundtripping.
296
        else:
297
            metadata = None
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
298
        parents = []
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
299
        for p in rev.parent_ids:
0.200.705 by Jelmer Vernooij
Cope with imports.
300
            try:
301
                git_p = parent_lookup(p)
302
            except KeyError:
303
                git_p = None
0.252.8 by Jelmer Vernooij
Support ghost revisions while roundtripping.
304
                if metadata is not None:
305
                    metadata.explicit_parent_ids = rev.parent_ids
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
306
            if git_p is not None:
0.361.1 by Jelmer Vernooij
Don't use assert.
307
                if len(git_p) != 40:
308
                    raise AssertionError("unexpected length for %r" % git_p)
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
309
                parents.append(git_p)
310
        commit.parents = parents
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
311
        try:
6973.12.9 by Jelmer Vernooij
More fixes.
312
            encoding = rev.properties[u'git-explicit-encoding']
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
313
        except KeyError:
6973.12.9 by Jelmer Vernooij
More fixes.
314
            encoding = rev.properties.get(u'git-implicit-encoding', 'utf-8')
0.320.3 by Jelmer Vernooij
Support gpg signatures.
315
        try:
7143.15.2 by Jelmer Vernooij
Run autopep8.
316
            commit.encoding = rev.properties[u'git-explicit-encoding'].encode(
317
                'ascii')
0.320.3 by Jelmer Vernooij
Support gpg signatures.
318
        except KeyError:
319
            pass
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
320
        commit.committer = fix_person_identifier(rev.committer.encode(
321
            encoding))
322
        commit.author = fix_person_identifier(
323
            rev.get_apparent_authors()[0].encode(encoding))
7018.3.2 by Jelmer Vernooij
Fix some git tests.
324
        # TODO(jelmer): Don't use this hack.
325
        long = getattr(__builtins__, 'long', int)
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
326
        commit.commit_time = long(rev.timestamp)
6973.12.9 by Jelmer Vernooij
More fixes.
327
        if u'author-timestamp' in rev.properties:
328
            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.
329
        else:
330
            commit.author_time = commit.commit_time
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
331
        commit._commit_timezone_neg_utc = (
332
            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.
333
        commit.commit_timezone = rev.timezone
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
334
        commit._author_timezone_neg_utc = (
335
            u"author-timezone-neg-utc" in rev.properties)
6973.12.9 by Jelmer Vernooij
More fixes.
336
        if u'author-timezone' in rev.properties:
337
            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.
338
        else:
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
339
            commit.author_timezone = commit.commit_timezone
6973.12.9 by Jelmer Vernooij
More fixes.
340
        if u'git-gpg-signature' in rev.properties:
7143.15.2 by Jelmer Vernooij
Run autopep8.
341
            commit.gpgsig = rev.properties[u'git-gpg-signature'].encode(
7490.76.1 by Jelmer Vernooij
Support non-utf-8 characters in Git repositories by surrogate-escaping them.
342
                'utf-8', 'surrogateescape')
0.200.1636 by Jelmer Vernooij
Some formatting fixes.
343
        commit.message = self._encode_commit_message(rev, rev.message,
7143.15.2 by Jelmer Vernooij
Run autopep8.
344
                                                     encoding)
6973.13.2 by Jelmer Vernooij
Fix some more tests.
345
        if not isinstance(commit.message, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
346
            raise TypeError(commit.message)
0.252.8 by Jelmer Vernooij
Support ghost revisions while roundtripping.
347
        if metadata is not None:
0.252.4 by Jelmer Vernooij
More work on roundtripping.
348
            try:
349
                mapping_registry.parse_revision_id(rev.revision_id)
350
            except errors.InvalidRevisionId:
351
                metadata.revision_id = rev.revision_id
0.252.10 by Jelmer Vernooij
Support roundtripping custom revision properties.
352
            mapping_properties = set(
6973.12.9 by Jelmer Vernooij
More fixes.
353
                [u'author', u'author-timezone', u'author-timezone-neg-utc',
354
                 u'commit-timezone-neg-utc', u'git-implicit-encoding',
7490.74.2 by Jelmer Vernooij
Use surrogateescape in revprops.
355
                 u'git-gpg-signature', u'git-explicit-encoding',
6973.12.9 by Jelmer Vernooij
More fixes.
356
                 u'author-timestamp', u'file-modes'])
7479.2.1 by Jelmer Vernooij
Drop python2 support.
357
            for k, v in rev.properties.items():
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
358
                if k not in mapping_properties:
0.252.10 by Jelmer Vernooij
Support roundtripping custom revision properties.
359
                    metadata.properties[k] = v
0.320.3 by Jelmer Vernooij
Support gpg signatures.
360
        if not lossy and metadata:
0.200.1510 by Jelmer Vernooij
Fix tests.
361
            if self.roundtripping:
0.200.1636 by Jelmer Vernooij
Some formatting fixes.
362
                commit.message = inject_bzr_metadata(commit.message, metadata,
0.200.1510 by Jelmer Vernooij
Fix tests.
363
                                                     encoding)
364
            else:
7143.15.2 by Jelmer Vernooij
Run autopep8.
365
                raise NoPushSupport(
366
                    None, None, self, revision_id=rev.revision_id)
6973.13.2 by Jelmer Vernooij
Fix some more tests.
367
        if not isinstance(commit.message, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
368
            raise TypeError(commit.message)
0.413.2 by Jelmer Vernooij
Add support for the mergetag property in git.
369
        i = 0
6973.12.9 by Jelmer Vernooij
More fixes.
370
        propname = u'git-mergetag-0'
0.413.2 by Jelmer Vernooij
Add support for the mergetag property in git.
371
        while propname in rev.properties:
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
372
            commit.mergetag.append(Tag.from_string(rev.properties[propname]))
0.413.2 by Jelmer Vernooij
Add support for the mergetag property in git.
373
            i += 1
6973.12.9 by Jelmer Vernooij
More fixes.
374
            propname = u'git-mergetag-%d' % i
375
        if u'git-extra' in rev.properties:
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
376
            commit.extra.extend(
377
                [l.split(b' ', 1)
378
                 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.
379
        return commit
380
7268.1.2 by Jelmer Vernooij
Allow access to native git repositories, ignoring unknown hg fields.
381
    def get_revision_id(self, commit):
382
        if commit.encoding:
383
            encoding = commit.encoding.decode('ascii')
384
        else:
385
            encoding = 'utf-8'
7290.21.1 by Jelmer Vernooij
Cope with utf-8 invalid characters in commit messages when scanning for revision ids.
386
        try:
387
            message, metadata = self._decode_commit_message(
388
                None, commit.message, encoding)
389
        except UnicodeDecodeError:
390
            pass
391
        else:
392
            if metadata.revision_id:
393
                return metadata.revision_id
7268.1.2 by Jelmer Vernooij
Allow access to native git repositories, ignoring unknown hg fields.
394
        return self.revision_id_foreign_to_bzr(commit.id)
395
7410.2.1 by Jelmer Vernooij
Allow unknown extras in git commits when just inspecting revisions, rather than importing.
396
    def import_commit(self, commit, lookup_parent_revid, strict=True):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
397
        """Convert a git commit to a bzr revision.
398
0.200.1646 by Jelmer Vernooij
Rename bzrlib to breezy.
399
        :return: a `breezy.revision.Revision` object, foreign revid and a
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
400
            testament sha1
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
401
        """
402
        if commit is None:
403
            raise AssertionError("Commit object can't be None")
0.200.826 by Jelmer Vernooij
Fix some long lines.
404
        rev = ForeignRevision(commit.id, self,
7143.15.2 by Jelmer Vernooij
Run autopep8.
405
                              self.revision_id_foreign_to_bzr(commit.id))
0.252.4 by Jelmer Vernooij
More work on roundtripping.
406
        rev.git_metadata = None
7143.15.2 by Jelmer Vernooij
Run autopep8.
407
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
408
        def decode_using_encoding(rev, commit, encoding):
7018.3.2 by Jelmer Vernooij
Fix some git tests.
409
            rev.committer = commit.committer.decode(encoding)
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
410
            if commit.committer != commit.author:
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
411
                rev.properties[u'author'] = commit.author.decode(encoding)
0.252.4 by Jelmer Vernooij
More work on roundtripping.
412
            rev.message, rev.git_metadata = self._decode_commit_message(
413
                rev, commit.message, encoding)
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
414
        if commit.encoding is not None:
7143.15.2 by Jelmer Vernooij
Run autopep8.
415
            rev.properties[u'git-explicit-encoding'] = commit.encoding.decode(
416
                'ascii')
7018.3.2 by Jelmer Vernooij
Fix some git tests.
417
            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
418
        else:
419
            for encoding in ('utf-8', 'latin1'):
420
                try:
421
                    decode_using_encoding(rev, commit, encoding)
422
                except UnicodeDecodeError:
423
                    pass
424
                else:
425
                    if encoding != 'utf-8':
6973.12.9 by Jelmer Vernooij
More fixes.
426
                        rev.properties[u'git-implicit-encoding'] = encoding
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
427
                    break
0.200.350 by Jelmer Vernooij
Support author_time
428
        if commit.commit_time != commit.author_time:
6973.12.9 by Jelmer Vernooij
More fixes.
429
            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.
430
        if commit.commit_timezone != commit.author_timezone:
6973.12.9 by Jelmer Vernooij
More fixes.
431
            rev.properties[u'author-timezone'] = "%d" % commit.author_timezone
0.200.884 by Jelmer Vernooij
Cope with -0000 as timezone in Git commits.
432
        if commit._author_timezone_neg_utc:
6973.12.9 by Jelmer Vernooij
More fixes.
433
            rev.properties[u'author-timezone-neg-utc'] = ""
0.200.884 by Jelmer Vernooij
Cope with -0000 as timezone in Git commits.
434
        if commit._commit_timezone_neg_utc:
6973.12.9 by Jelmer Vernooij
More fixes.
435
            rev.properties[u'commit-timezone-neg-utc'] = ""
0.320.3 by Jelmer Vernooij
Support gpg signatures.
436
        if commit.gpgsig:
7490.74.2 by Jelmer Vernooij
Use surrogateescape in revprops.
437
            rev.properties[u'git-gpg-signature'] = commit.gpgsig.decode(
438
                'utf-8', 'surrogateescape')
0.413.1 by Jelmer Vernooij
Raise AssertionError upon encountering mergetag.
439
        if commit.mergetag:
0.413.2 by Jelmer Vernooij
Add support for the mergetag property in git.
440
            for i, tag in enumerate(commit.mergetag):
6973.12.9 by Jelmer Vernooij
More fixes.
441
                rev.properties[u'git-mergetag-%d' % i] = tag.as_raw_string()
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
442
        rev.timestamp = commit.commit_time
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
443
        rev.timezone = commit.commit_timezone
0.261.5 by Jelmer Vernooij
Fix looking up of parents during fetch.
444
        rev.parent_ids = None
0.252.4 by Jelmer Vernooij
More work on roundtripping.
445
        if rev.git_metadata is not None:
0.252.6 by Jelmer Vernooij
Roundtripping support for revision ids works.
446
            md = rev.git_metadata
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
447
            roundtrip_revid = md.revision_id
0.252.8 by Jelmer Vernooij
Support ghost revisions while roundtripping.
448
            if md.explicit_parent_ids:
449
                rev.parent_ids = md.explicit_parent_ids
0.252.10 by Jelmer Vernooij
Support roundtripping custom revision properties.
450
            rev.properties.update(md.properties)
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
451
            verifiers = md.verifiers
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
452
        else:
453
            roundtrip_revid = None
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
454
            verifiers = {}
0.261.5 by Jelmer Vernooij
Fix looking up of parents during fetch.
455
        if rev.parent_ids is None:
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
456
            parents = []
457
            for p in commit.parents:
458
                try:
459
                    parents.append(lookup_parent_revid(p))
460
                except KeyError:
461
                    parents.append(self.revision_id_foreign_to_bzr(p))
7096.3.2 by Jelmer Vernooij
Fix some git tests.
462
            rev.parent_ids = list(parents)
0.200.1639 by Jelmer Vernooij
Properly roundtrip HG:rename-source fields.
463
        unknown_extra_fields = []
464
        extra_lines = []
465
        for k, v in commit.extra:
466
            if k == HG_RENAME_SOURCE:
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
467
                extra_lines.append(k + b' ' + v + b'\n')
0.200.1640 by Jelmer Vernooij
Support HG extra 'amend_source'.
468
            elif k == HG_EXTRA:
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
469
                hgk, hgv = v.split(b':', 1)
7410.2.1 by Jelmer Vernooij
Allow unknown extras in git commits when just inspecting revisions, rather than importing.
470
                if hgk not in (HG_EXTRA_AMEND_SOURCE, ) and strict:
7240.10.2 by Jelmer Vernooij
Fix test.
471
                    raise UnknownMercurialCommitExtra(commit, [hgk])
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
472
                extra_lines.append(k + b' ' + v + b'\n')
0.200.1639 by Jelmer Vernooij
Properly roundtrip HG:rename-source fields.
473
            else:
474
                unknown_extra_fields.append(k)
7410.2.1 by Jelmer Vernooij
Allow unknown extras in git commits when just inspecting revisions, rather than importing.
475
        if unknown_extra_fields and strict:
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
476
            raise UnknownCommitExtra(
7143.15.3 by Jelmer Vernooij
Fix pep8 issues in breezy.git.
477
                commit,
478
                [f.decode('ascii', 'replace') for f in unknown_extra_fields])
0.200.1639 by Jelmer Vernooij
Properly roundtrip HG:rename-source fields.
479
        if extra_lines:
7018.3.7 by Jelmer Vernooij
Fix remaining git tests.
480
            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.
481
        return rev, roundtrip_revid, verifiers
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
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
7358.13.1 by Jelmer Vernooij
Drop file id roundtripping support in Git.
495
    roundtripping = False
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
496
497
    BZR_DUMMY_FILE = '.bzrdummy'
498
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
499
    def _decode_commit_message(self, rev, message, encoding):
7268.1.2 by Jelmer Vernooij
Allow access to native git repositories, ignoring unknown hg fields.
500
        if rev is None:
501
            rev = Revision()
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
7410.2.1 by Jelmer Vernooij
Allow unknown extras in git commits when just inspecting revisions, rather than importing.
513
    def import_commit(self, commit, lookup_parent_revid, strict=True):
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(
7410.2.1 by Jelmer Vernooij
Allow unknown extras in git commits when just inspecting revisions, rather than importing.
516
                commit, lookup_parent_revid, strict)
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()
7479.2.1 by Jelmer Vernooij
Drop python2 support.
584
    if isinstance(symlink_target, str):
7490.70.1 by Jelmer Vernooij
Add functions for encoding/decoding git paths.
585
        symlink_target = encode_git_path(symlink_target)
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
0.320.2 by Jelmer Vernooij
Only complain about roundtripping if revisions being pushed didn't originally come from git.
659
def needs_roundtripping(repo, revid):
660
    try:
661
        mapping_registry.parse_revision_id(revid)
662
    except errors.InvalidRevisionId:
663
        return True
664
    else:
665
        return False