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