/brz/remove-bazaar

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