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