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