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