/brz/remove-bazaar

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