/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
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
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
    )
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
33
from ...bzr.inventory import (
0.200.292 by Jelmer Vernooij
Fix formatting.
34
    ROOT_ID,
35
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
36
from ...foreign import (
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
37
    ForeignVcs,
38
    VcsMappingRegistry,
0.200.292 by Jelmer Vernooij
Fix formatting.
39
    ForeignRevision,
40
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
41
from ...revision import (
0.200.701 by Jelmer Vernooij
Fix check in git repos.
42
    NULL_REVISION,
43
    )
7018.3.2 by Jelmer Vernooij
Fix some git tests.
44
from ...sixish import (
45
    text_type,
46
    viewitems,
47
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
48
from .errors import (
0.200.1598 by Jelmer Vernooij
Print proper error when unknown fields are encountered.
49
    NoPushSupport,
50
    UnknownCommitExtra,
0.200.1640 by Jelmer Vernooij
Support HG extra 'amend_source'.
51
    UnknownMercurialCommitExtra,
0.200.1598 by Jelmer Vernooij
Print proper error when unknown fields are encountered.
52
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
53
from .hg import (
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
54
    format_hg_metadata,
55
    extract_hg_metadata,
56
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
57
from .roundtrip import (
0.252.2 by Jelmer Vernooij
Add functions for adding metadata to revision messages.
58
    extract_bzr_metadata,
0.252.4 by Jelmer Vernooij
More work on roundtripping.
59
    inject_bzr_metadata,
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
60
    CommitSupplement,
0.252.23 by Jelmer Vernooij
More work on roundtripping support.
61
    deserialize_fileid_map,
62
    serialize_fileid_map,
0.252.2 by Jelmer Vernooij
Add functions for adding metadata to revision messages.
63
    )
0.200.309 by Jelmer Vernooij
Add XML escaping to work around serialization bug in bzr.
64
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
65
66
DEFAULT_FILE_MODE = stat.S_IFREG | 0o644
0.200.1638 by Jelmer Vernooij
Support HG:rename-source extra fields.
67
HG_RENAME_SOURCE = "HG:rename-source"
0.200.1640 by Jelmer Vernooij
Support HG extra 'amend_source'.
68
HG_EXTRA = "HG:extra"
69
70
# This HG extra is used to indicate the commit that this commit was based on.
71
HG_EXTRA_AMEND_SOURCE = "amend_source"
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
72
0.200.1712 by Jelmer Vernooij
Add file_id prefix.
73
FILE_ID_PREFIX = b'git:'
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):
7018.3.2 by Jelmer Vernooij
Fix some git tests.
77
    return file_id.replace(b'_', b'__').replace(b' ', b'_s').replace(b'\x0c', b'_c')
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
78
79
80
def unescape_file_id(file_id):
0.200.390 by Jelmer Vernooij
Fix file id unescape function when there are other underscores in the file id.
81
    ret = []
82
    i = 0
83
    while i < len(file_id):
84
        if file_id[i] != '_':
85
            ret.append(file_id[i])
86
        else:
87
            if file_id[i+1] == '_':
88
                ret.append("_")
89
            elif file_id[i+1] == 's':
90
                ret.append(" ")
0.200.1419 by Jelmer Vernooij
Escape/unescape ^L characters.
91
            elif file_id[i+1] == 'c':
92
                ret.append("\x0c")
0.200.390 by Jelmer Vernooij
Fix file id unescape function when there are other underscores in the file id.
93
            else:
0.200.1712 by Jelmer Vernooij
Add file_id prefix.
94
                raise ValueError("unknown escape character %s" %
0.200.826 by Jelmer Vernooij
Fix some long lines.
95
                    file_id[i+1])
0.200.390 by Jelmer Vernooij
Fix file id unescape function when there are other underscores in the file id.
96
            i += 1
97
        i += 1
98
    return "".join(ret)
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
99
100
0.200.376 by Jelmer Vernooij
Make sure author and committer names pushed to git contain < and >, otherwise the git parser barfs.
101
def fix_person_identifier(text):
7018.3.2 by Jelmer Vernooij
Fix some git tests.
102
    if not b"<" in text and not b">" in text:
0.402.1 by Jelmer Vernooij
Improve identifier handling.
103
        username = text
104
        email = text
105
    else:
7018.3.2 by Jelmer Vernooij
Fix some git tests.
106
        if text.rindex(b">") < text.rindex(b"<"):
0.402.1 by Jelmer Vernooij
Improve identifier handling.
107
            raise ValueError(text)
7018.3.2 by Jelmer Vernooij
Fix some git tests.
108
        username, email = text.split(b"<", 2)[-2:]
109
        email = email.split(b">", 1)[0]
110
        if username.endswith(b" "):
0.402.1 by Jelmer Vernooij
Improve identifier handling.
111
            username = username[:-1]
7018.3.2 by Jelmer Vernooij
Fix some git tests.
112
    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.
113
114
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
115
def warn_escaped(commit, num_escaped):
116
    trace.warning("Escaped %d XML-invalid characters in %s. Will be unable "
117
                  "to regenerate the SHA map.", num_escaped, commit)
118
119
120
def warn_unusual_mode(commit, path, mode):
0.200.826 by Jelmer Vernooij
Fix some long lines.
121
    trace.mutter("Unusual file mode %o for %s in %s. Storing as revision "
122
                 "property. ", mode, path, commit)
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
123
124
0.206.1 by Jelmer Vernooij
Use foreign utility functions.
125
class BzrGitMapping(foreign.VcsMapping):
0.200.97 by Jelmer Vernooij
use mapping object.
126
    """Class that maps between Git and Bazaar semantics."""
127
    experimental = False
128
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
129
    BZR_FILE_IDS_FILE = None
0.252.23 by Jelmer Vernooij
More work on roundtripping support.
130
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
131
    BZR_DUMMY_FILE = None
0.252.26 by Jelmer Vernooij
Add is_control_file method to BzrGitMapping.
132
0.200.1328 by Jelmer Vernooij
More test fixes.
133
    def is_special_file(self, filename):
134
        return (filename in (self.BZR_FILE_IDS_FILE, self.BZR_DUMMY_FILE))
135
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
136
    def __init__(self):
0.200.1263 by Jelmer Vernooij
Fix foreign_vcs_git.
137
        super(BzrGitMapping, self).__init__(foreign_vcs_git)
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
138
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
139
    def __eq__(self, other):
0.200.1020 by Jelmer Vernooij
Store testament-sha1 in metadata.
140
        return (type(self) == type(other) and
0.200.726 by Jelmer Vernooij
Factor out conversion of branch names to refs.
141
                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.
142
143
    @classmethod
144
    def revision_id_foreign_to_bzr(cls, git_rev_id):
0.200.97 by Jelmer Vernooij
use mapping object.
145
        """Convert a git revision id handle to a Bazaar revision id."""
0.200.891 by Jelmer Vernooij
Use ZERO_SHA constant where possible.
146
        from dulwich.protocol import ZERO_SHA
147
        if git_rev_id == ZERO_SHA:
0.200.769 by Jelmer Vernooij
Cope with open_branch() actually checking whether there is a branch present.
148
            return NULL_REVISION
7018.3.2 by Jelmer Vernooij
Fix some git tests.
149
        return b"%s:%s" % (cls.revid_prefix, git_rev_id)
0.200.97 by Jelmer Vernooij
use mapping object.
150
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
151
    @classmethod
152
    def revision_id_bzr_to_foreign(cls, bzr_rev_id):
0.200.97 by Jelmer Vernooij
use mapping object.
153
        """Convert a Bazaar revision id to a git revision id handle."""
7018.3.2 by Jelmer Vernooij
Fix some git tests.
154
        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.
155
            raise errors.InvalidRevisionId(bzr_rev_id, cls)
156
        return bzr_rev_id[len(cls.revid_prefix)+1:], cls()
0.200.97 by Jelmer Vernooij
use mapping object.
157
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
158
    def generate_file_id(self, path):
0.200.297 by Jelmer Vernooij
Cope with non-ascii characters in filenames (needs a test..).
159
        # Git paths are just bytestrings
160
        # We must just hope they are valid UTF-8..
0.200.157 by Jelmer Vernooij
Fix some bit of fetching.
161
        if path == "":
162
            return ROOT_ID
6973.6.2 by Jelmer Vernooij
Fix more tests.
163
        if isinstance(path, text_type):
0.200.973 by Jelmer Vernooij
Add tests for generate_file_id.
164
            path = path.encode("utf-8")
0.200.1712 by Jelmer Vernooij
Add file_id prefix.
165
        return FILE_ID_PREFIX + escape_file_id(path)
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
166
0.230.2 by Jelmer Vernooij
Fix versionedfiles.
167
    def parse_file_id(self, file_id):
168
        if file_id == ROOT_ID:
169
            return ""
0.200.1712 by Jelmer Vernooij
Add file_id prefix.
170
        if not file_id.startswith(FILE_ID_PREFIX):
171
            raise ValueError
172
        return unescape_file_id(file_id[len(FILE_ID_PREFIX):])
0.230.2 by Jelmer Vernooij
Fix versionedfiles.
173
0.252.31 by Jelmer Vernooij
Properly escape revids when using them in ref names.
174
    def revid_as_refname(self, revid):
7018.3.2 by Jelmer Vernooij
Fix some git tests.
175
        if not isinstance(revid, bytes):
176
            raise TypeError(revid)
177
        return b"refs/bzr/" + urlutils.quote(revid)
0.252.31 by Jelmer Vernooij
Properly escape revids when using them in ref names.
178
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
179
    def import_unusual_file_modes(self, rev, unusual_file_modes):
180
        if unusual_file_modes:
0.200.878 by Jelmer Vernooij
Fix determining of unusual file modes.
181
            ret = [(path, unusual_file_modes[path])
182
                   for path in sorted(unusual_file_modes.keys())]
6973.12.9 by Jelmer Vernooij
More fixes.
183
            rev.properties[u'file-modes'] = bencode.bencode(ret)
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
184
0.200.547 by Jelmer Vernooij
Support getting unusual file modes out of revision properties.
185
    def export_unusual_file_modes(self, rev):
186
        try:
6973.12.9 by Jelmer Vernooij
More fixes.
187
            file_modes = rev.properties[u'file-modes']
0.200.547 by Jelmer Vernooij
Support getting unusual file modes out of revision properties.
188
        except KeyError:
189
            return {}
0.200.894 by Jelmer Vernooij
Simplify formatting a bit.
190
        else:
0.421.6 by Jelmer Vernooij
Some more simplifications.
191
            return dict(bencode.bdecode(file_modes.encode("utf-8")))
0.200.547 by Jelmer Vernooij
Support getting unusual file modes out of revision properties.
192
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
193
    def _generate_git_svn_metadata(self, rev, encoding):
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
194
        try:
6973.12.9 by Jelmer Vernooij
More fixes.
195
            git_svn_id = rev.properties[u"git-svn-id"]
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
196
        except KeyError:
197
            return ""
0.200.894 by Jelmer Vernooij
Simplify formatting a bit.
198
        else:
199
            return "\ngit-svn-id: %s\n" % git_svn_id.encode(encoding)
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
200
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
201
    def _generate_hg_message_tail(self, rev):
202
        extra = {}
203
        renames = []
0.200.639 by Jelmer Vernooij
Support renames in hg-git messages as well.
204
        branch = 'default'
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
205
        for name in rev.properties:
6973.12.9 by Jelmer Vernooij
More fixes.
206
            if name == u'hg:extra:branch':
207
                branch = rev.properties[u'hg:extra:branch']
208
            elif name.startswith(u'hg:extra'):
209
                extra[name[len(u'hg:extra:'):]] = base64.b64decode(
0.200.826 by Jelmer Vernooij
Fix some long lines.
210
                    rev.properties[name])
6973.12.9 by Jelmer Vernooij
More fixes.
211
            elif name == u'hg:renames':
0.200.826 by Jelmer Vernooij
Fix some long lines.
212
                renames = bencode.bdecode(base64.b64decode(
6973.12.9 by Jelmer Vernooij
More fixes.
213
                    rev.properties[u'hg:renames']))
0.200.639 by Jelmer Vernooij
Support renames in hg-git messages as well.
214
            # TODO: Export other properties as 'bzr:' extras?
0.200.660 by Jelmer Vernooij
Fix encoding issues.
215
        ret = format_hg_metadata(renames, branch, extra)
0.361.1 by Jelmer Vernooij
Don't use assert.
216
        if type(ret) is not str:
217
            raise TypeError(ret)
0.200.660 by Jelmer Vernooij
Fix encoding issues.
218
        return ret
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
219
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
220
    def _extract_git_svn_metadata(self, rev, message):
221
        lines = message.split("\n")
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
222
        if not (lines[-1] == "" and len(lines) >= 2 and lines[-2].startswith("git-svn-id:")):
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
223
            return message
0.200.652 by Jelmer Vernooij
Split out git-svn-id parser as separate function, implement ForeignGit.serialize_foreign_revid.
224
        git_svn_id = lines[-2].split(": ", 1)[1]
6973.12.9 by Jelmer Vernooij
More fixes.
225
        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.
226
        (url, rev, uuid) = parse_git_svn_id(git_svn_id)
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
227
        # FIXME: Convert this to converted-from property somehow..
0.361.1 by Jelmer Vernooij
Don't use assert.
228
        return "\n".join(lines[:-2])
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
229
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
230
    def _extract_hg_metadata(self, rev, message):
231
        (message, renames, branch, extra) = extract_hg_metadata(message)
232
        if branch is not None:
6973.12.9 by Jelmer Vernooij
More fixes.
233
            rev.properties[u'hg:extra:branch'] = branch
7018.3.2 by Jelmer Vernooij
Fix some git tests.
234
        for name, value in viewitems(extra):
6973.12.9 by Jelmer Vernooij
More fixes.
235
            rev.properties[u'hg:extra:' + name] = base64.b64encode(value)
0.200.639 by Jelmer Vernooij
Support renames in hg-git messages as well.
236
        if renames:
6973.12.9 by Jelmer Vernooij
More fixes.
237
            rev.properties[u'hg:renames'] = base64.b64encode(bencode.bencode(
7018.3.2 by Jelmer Vernooij
Fix some git tests.
238
                [(new, old) for (old, new) in viewitems(renames)]))
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
239
        return message
240
0.252.2 by Jelmer Vernooij
Add functions for adding metadata to revision messages.
241
    def _extract_bzr_metadata(self, rev, message):
242
        (message, metadata) = extract_bzr_metadata(message)
0.252.4 by Jelmer Vernooij
More work on roundtripping.
243
        return message, metadata
0.252.2 by Jelmer Vernooij
Add functions for adding metadata to revision messages.
244
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
245
    def _decode_commit_message(self, rev, message, encoding):
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
246
        return message.decode(encoding), CommitSupplement()
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
247
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
248
    def _encode_commit_message(self, rev, message, encoding):
249
        return message.encode(encoding)
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
250
0.252.22 by Jelmer Vernooij
Fix file id map (de)serialization.
251
    def export_fileid_map(self, fileid_map):
252
        """Export a file id map to a fileid map.
253
254
        :param fileid_map: File id map, mapping paths to file ids
0.320.1 by Jelmer Vernooij
Don't set file ids unless different from default.
255
        :return: A Git blob object (or None if there are no entries)
0.252.22 by Jelmer Vernooij
Fix file id map (de)serialization.
256
        """
0.252.23 by Jelmer Vernooij
More work on roundtripping support.
257
        from dulwich.objects import Blob
258
        b = Blob()
259
        b.set_raw_chunks(serialize_fileid_map(fileid_map))
260
        return b
0.252.22 by Jelmer Vernooij
Fix file id map (de)serialization.
261
0.200.1509 by Jelmer Vernooij
Properly raise exception when pulling from git into bzr without experimental mappings.
262
    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.
263
                      verifiers):
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
264
        """Turn a Bazaar revision in to a Git commit
265
266
        :param tree_sha: Tree sha for the commit
0.200.826 by Jelmer Vernooij
Fix some long lines.
267
        :param parent_lookup: Function for looking up the GIT sha equiv of a
268
            bzr revision
0.200.1509 by Jelmer Vernooij
Properly raise exception when pulling from git into bzr without experimental mappings.
269
        :param lossy: Whether to store roundtripping information.
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
270
        :param verifiers: Verifiers info
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
271
        :return dulwich.objects.Commit represent the revision:
272
        """
0.413.2 by Jelmer Vernooij
Add support for the mergetag property in git.
273
        from dulwich.objects import Commit, Tag
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
274
        commit = Commit()
275
        commit.tree = tree_sha
0.200.1509 by Jelmer Vernooij
Properly raise exception when pulling from git into bzr without experimental mappings.
276
        if not lossy:
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
277
            metadata = CommitSupplement()
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
278
            metadata.verifiers = verifiers
0.252.8 by Jelmer Vernooij
Support ghost revisions while roundtripping.
279
        else:
280
            metadata = None
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
281
        parents = []
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
282
        for p in rev.parent_ids:
0.200.705 by Jelmer Vernooij
Cope with imports.
283
            try:
284
                git_p = parent_lookup(p)
285
            except KeyError:
286
                git_p = None
0.252.8 by Jelmer Vernooij
Support ghost revisions while roundtripping.
287
                if metadata is not None:
288
                    metadata.explicit_parent_ids = rev.parent_ids
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
289
            if git_p is not None:
0.361.1 by Jelmer Vernooij
Don't use assert.
290
                if len(git_p) != 40:
291
                    raise AssertionError("unexpected length for %r" % git_p)
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
292
                parents.append(git_p)
293
        commit.parents = parents
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
294
        try:
6973.12.9 by Jelmer Vernooij
More fixes.
295
            encoding = rev.properties[u'git-explicit-encoding']
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
296
        except KeyError:
6973.12.9 by Jelmer Vernooij
More fixes.
297
            encoding = rev.properties.get(u'git-implicit-encoding', 'utf-8')
0.320.3 by Jelmer Vernooij
Support gpg signatures.
298
        try:
6973.12.9 by Jelmer Vernooij
More fixes.
299
            commit.encoding = rev.properties[u'git-explicit-encoding'].encode('ascii')
0.320.3 by Jelmer Vernooij
Support gpg signatures.
300
        except KeyError:
301
            pass
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
302
        commit.committer = fix_person_identifier(rev.committer.encode(
303
            encoding))
304
        commit.author = fix_person_identifier(
305
            rev.get_apparent_authors()[0].encode(encoding))
7018.3.2 by Jelmer Vernooij
Fix some git tests.
306
        # TODO(jelmer): Don't use this hack.
307
        long = getattr(__builtins__, 'long', int)
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
308
        commit.commit_time = long(rev.timestamp)
6973.12.9 by Jelmer Vernooij
More fixes.
309
        if u'author-timestamp' in rev.properties:
310
            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.
311
        else:
312
            commit.author_time = commit.commit_time
6973.12.9 by Jelmer Vernooij
More fixes.
313
        commit._commit_timezone_neg_utc = 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.
314
        commit.commit_timezone = rev.timezone
6973.12.9 by Jelmer Vernooij
More fixes.
315
        commit._author_timezone_neg_utc = u"author-timezone-neg-utc" in rev.properties
316
        if u'author-timezone' in rev.properties:
317
            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.
318
        else:
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
319
            commit.author_timezone = commit.commit_timezone
6973.12.9 by Jelmer Vernooij
More fixes.
320
        if u'git-gpg-signature' in rev.properties:
321
            commit.gpgsig = rev.properties[u'git-gpg-signature'].encode('ascii')
0.200.1636 by Jelmer Vernooij
Some formatting fixes.
322
        commit.message = self._encode_commit_message(rev, rev.message,
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
323
            encoding)
7018.3.2 by Jelmer Vernooij
Fix some git tests.
324
        if not isinstance(commit.message, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
325
            raise TypeError(commit.message)
0.252.8 by Jelmer Vernooij
Support ghost revisions while roundtripping.
326
        if metadata is not None:
0.252.4 by Jelmer Vernooij
More work on roundtripping.
327
            try:
328
                mapping_registry.parse_revision_id(rev.revision_id)
329
            except errors.InvalidRevisionId:
330
                metadata.revision_id = rev.revision_id
0.252.10 by Jelmer Vernooij
Support roundtripping custom revision properties.
331
            mapping_properties = set(
6973.12.9 by Jelmer Vernooij
More fixes.
332
                [u'author', u'author-timezone', u'author-timezone-neg-utc',
333
                 u'commit-timezone-neg-utc', u'git-implicit-encoding',
334
                 u'git-gpg-signature', u'git-explicit-encoding',
335
                 u'author-timestamp', u'file-modes'])
7018.3.2 by Jelmer Vernooij
Fix some git tests.
336
            for k, v in viewitems(rev.properties):
0.252.10 by Jelmer Vernooij
Support roundtripping custom revision properties.
337
                if not k in mapping_properties:
338
                    metadata.properties[k] = v
0.320.3 by Jelmer Vernooij
Support gpg signatures.
339
        if not lossy and metadata:
0.200.1510 by Jelmer Vernooij
Fix tests.
340
            if self.roundtripping:
0.200.1636 by Jelmer Vernooij
Some formatting fixes.
341
                commit.message = inject_bzr_metadata(commit.message, metadata,
0.200.1510 by Jelmer Vernooij
Fix tests.
342
                                                     encoding)
343
            else:
6997.3.1 by Jelmer Vernooij
Fix 'brz git --serve' for native git repositories.
344
                raise NoPushSupport(None, None, self, revision_id=rev.revision_id)
7018.3.2 by Jelmer Vernooij
Fix some git tests.
345
        if not isinstance(commit.message, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
346
            raise TypeError(commit.message)
0.413.2 by Jelmer Vernooij
Add support for the mergetag property in git.
347
        i = 0
6973.12.9 by Jelmer Vernooij
More fixes.
348
        propname = u'git-mergetag-0'
0.413.2 by Jelmer Vernooij
Add support for the mergetag property in git.
349
        while propname in rev.properties:
0.414.3 by Jelmer Vernooij
Fix encoding.
350
            commit.mergetag.append(Tag.from_string(rev.properties[propname].encode(encoding)))
0.413.2 by Jelmer Vernooij
Add support for the mergetag property in git.
351
            i += 1
6973.12.9 by Jelmer Vernooij
More fixes.
352
            propname = u'git-mergetag-%d' % i
353
        if u'git-extra' in rev.properties:
354
            commit.extra.extend([l.split(' ', 1) 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.
355
        return commit
356
0.252.22 by Jelmer Vernooij
Fix file id map (de)serialization.
357
    def import_fileid_map(self, blob):
358
        """Convert a git file id map blob.
359
360
        :param blob: Git blob object with fileid map
361
        :return: Dictionary mapping paths to file ids
362
        """
0.252.35 by Jelmer Vernooij
Ignore control files in inventories.
363
        return deserialize_fileid_map(blob.data)
0.252.22 by Jelmer Vernooij
Fix file id map (de)serialization.
364
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
365
    def import_commit(self, commit, lookup_parent_revid):
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
366
        """Convert a git commit to a bzr revision.
367
0.200.1646 by Jelmer Vernooij
Rename bzrlib to breezy.
368
        :return: a `breezy.revision.Revision` object, foreign revid and a
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
369
            testament sha1
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
370
        """
371
        if commit is None:
372
            raise AssertionError("Commit object can't be None")
0.200.826 by Jelmer Vernooij
Fix some long lines.
373
        rev = ForeignRevision(commit.id, self,
374
                self.revision_id_foreign_to_bzr(commit.id))
0.252.4 by Jelmer Vernooij
More work on roundtripping.
375
        rev.git_metadata = None
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
376
        def decode_using_encoding(rev, commit, encoding):
7018.3.2 by Jelmer Vernooij
Fix some git tests.
377
            rev.committer = commit.committer.decode(encoding)
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
378
            if commit.committer != commit.author:
6973.12.9 by Jelmer Vernooij
More fixes.
379
                rev.properties[u'author'] = str(commit.author).decode(encoding)
0.252.4 by Jelmer Vernooij
More work on roundtripping.
380
            rev.message, rev.git_metadata = self._decode_commit_message(
381
                rev, commit.message, encoding)
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
382
        if commit.encoding is not None:
7018.3.2 by Jelmer Vernooij
Fix some git tests.
383
            rev.properties[u'git-explicit-encoding'] = commit.encoding.decode('ascii')
384
            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
385
        else:
386
            for encoding in ('utf-8', 'latin1'):
387
                try:
388
                    decode_using_encoding(rev, commit, encoding)
389
                except UnicodeDecodeError:
390
                    pass
391
                else:
392
                    if encoding != 'utf-8':
6973.12.9 by Jelmer Vernooij
More fixes.
393
                        rev.properties[u'git-implicit-encoding'] = encoding
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
394
                    break
0.200.350 by Jelmer Vernooij
Support author_time
395
        if commit.commit_time != commit.author_time:
6973.12.9 by Jelmer Vernooij
More fixes.
396
            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.
397
        if commit.commit_timezone != commit.author_timezone:
6973.12.9 by Jelmer Vernooij
More fixes.
398
            rev.properties[u'author-timezone'] = "%d" % commit.author_timezone
0.200.884 by Jelmer Vernooij
Cope with -0000 as timezone in Git commits.
399
        if commit._author_timezone_neg_utc:
6973.12.9 by Jelmer Vernooij
More fixes.
400
            rev.properties[u'author-timezone-neg-utc'] = ""
0.200.884 by Jelmer Vernooij
Cope with -0000 as timezone in Git commits.
401
        if commit._commit_timezone_neg_utc:
6973.12.9 by Jelmer Vernooij
More fixes.
402
            rev.properties[u'commit-timezone-neg-utc'] = ""
0.320.3 by Jelmer Vernooij
Support gpg signatures.
403
        if commit.gpgsig:
6973.12.9 by Jelmer Vernooij
More fixes.
404
            rev.properties[u'git-gpg-signature'] = commit.gpgsig.decode('ascii')
0.413.1 by Jelmer Vernooij
Raise AssertionError upon encountering mergetag.
405
        if commit.mergetag:
0.413.2 by Jelmer Vernooij
Add support for the mergetag property in git.
406
            for i, tag in enumerate(commit.mergetag):
6973.12.9 by Jelmer Vernooij
More fixes.
407
                rev.properties[u'git-mergetag-%d' % i] = tag.as_raw_string()
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
408
        rev.timestamp = commit.commit_time
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
409
        rev.timezone = commit.commit_timezone
0.261.5 by Jelmer Vernooij
Fix looking up of parents during fetch.
410
        rev.parent_ids = None
0.252.4 by Jelmer Vernooij
More work on roundtripping.
411
        if rev.git_metadata is not None:
0.252.6 by Jelmer Vernooij
Roundtripping support for revision ids works.
412
            md = rev.git_metadata
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
413
            roundtrip_revid = md.revision_id
0.252.8 by Jelmer Vernooij
Support ghost revisions while roundtripping.
414
            if md.explicit_parent_ids:
415
                rev.parent_ids = md.explicit_parent_ids
0.252.10 by Jelmer Vernooij
Support roundtripping custom revision properties.
416
            rev.properties.update(md.properties)
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
417
            verifiers = md.verifiers
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
418
        else:
419
            roundtrip_revid = None
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
420
            verifiers = {}
0.261.5 by Jelmer Vernooij
Fix looking up of parents during fetch.
421
        if rev.parent_ids is None:
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
422
            parents = []
423
            for p in commit.parents:
424
                try:
425
                    parents.append(lookup_parent_revid(p))
426
                except KeyError:
427
                    parents.append(self.revision_id_foreign_to_bzr(p))
428
            rev.parent_ids = tuple(parents)
0.200.1639 by Jelmer Vernooij
Properly roundtrip HG:rename-source fields.
429
        unknown_extra_fields = []
430
        extra_lines = []
431
        for k, v in commit.extra:
432
            if k == HG_RENAME_SOURCE:
433
                extra_lines.append(k + ' ' + v + '\n')
0.200.1640 by Jelmer Vernooij
Support HG extra 'amend_source'.
434
            elif k == HG_EXTRA:
435
                hgk, hgv = v.split(':', 1)
436
                if hgk not in (HG_EXTRA_AMEND_SOURCE, ):
437
                    raise UnknownMercurialCommitExtra(commit, hgk)
438
                extra_lines.append(k + ' ' + v + '\n')
0.200.1639 by Jelmer Vernooij
Properly roundtrip HG:rename-source fields.
439
            else:
440
                unknown_extra_fields.append(k)
441
        if unknown_extra_fields:
442
            raise UnknownCommitExtra(commit, unknown_extra_fields)
443
        if extra_lines:
6973.12.9 by Jelmer Vernooij
More fixes.
444
            rev.properties[u'git-extra'] = ''.join(extra_lines)
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
445
        return rev, roundtrip_revid, verifiers
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
446
0.252.43 by Jelmer Vernooij
Some refactoring, support proper file ids in revision deltas.
447
    def get_fileid_map(self, lookup_object, tree_sha):
448
        """Obtain a fileid map for a particular tree.
449
450
        :param lookup_object: Function for looking up an object
451
        :param tree_sha: SHA of the root tree
452
        :return: GitFileIdMap instance
453
        """
454
        try:
455
            file_id_map_sha = lookup_object(tree_sha)[self.BZR_FILE_IDS_FILE][1]
456
        except KeyError:
457
            file_ids = {}
458
        else:
459
            file_ids = self.import_fileid_map(lookup_object(file_id_map_sha))
460
        return GitFileIdMap(file_ids, self)
461
0.200.97 by Jelmer Vernooij
use mapping object.
462
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
463
class BzrGitMappingv1(BzrGitMapping):
7018.3.2 by Jelmer Vernooij
Fix some git tests.
464
    revid_prefix = b'git-v1'
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
465
    experimental = False
466
0.200.393 by Jelmer Vernooij
Provide __str__ implementation for mapping, fix docstring for ForeignGit.
467
    def __str__(self):
468
        return self.revid_prefix
469
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
470
471
class BzrGitMappingExperimental(BzrGitMappingv1):
7018.3.2 by Jelmer Vernooij
Fix some git tests.
472
    revid_prefix = b'git-experimental'
0.200.104 by Jelmer Vernooij
Use bzr-foreign function names for converting between git and bzr revids.
473
    experimental = True
0.200.912 by Jelmer Vernooij
Merge roundtrip support.
474
    roundtripping = True
0.200.97 by Jelmer Vernooij
use mapping object.
475
0.200.915 by Jelmer Vernooij
Cope with the fact that the old format didn't export file ids.
476
    BZR_FILE_IDS_FILE = '.bzrfileids'
477
478
    BZR_DUMMY_FILE = '.bzrdummy'
479
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
480
    def _decode_commit_message(self, rev, message, encoding):
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
481
        message = self._extract_hg_metadata(rev, message)
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
482
        message = self._extract_git_svn_metadata(rev, message)
0.252.4 by Jelmer Vernooij
More work on roundtripping.
483
        message, metadata = self._extract_bzr_metadata(rev, message)
484
        return message.decode(encoding), metadata
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
485
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
486
    def _encode_commit_message(self, rev, message, encoding):
487
        ret = message.encode(encoding)
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
488
        ret += self._generate_hg_message_tail(rev)
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
489
        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.
490
        return ret
491
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
492
    def import_commit(self, commit, lookup_parent_revid):
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
493
        rev, roundtrip_revid, verifiers = super(BzrGitMappingExperimental, self).import_commit(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
7018.3.2 by Jelmer Vernooij
Fix some git 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)
7018.3.2 by Jelmer Vernooij
Fix some git 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()
7018.3.2 by Jelmer Vernooij
Fix some git tests.
515
mapping_registry.register_lazy(b'git-v1', "breezy.plugins.git.mapping",
0.200.826 by Jelmer Vernooij
Fix some long lines.
516
    "BzrGitMappingv1")
7018.3.2 by Jelmer Vernooij
Fix some git tests.
517
mapping_registry.register_lazy(b'git-experimental',
0.200.1646 by Jelmer Vernooij
Rename bzrlib to breezy.
518
    "breezy.plugins.git.mapping", "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.
0.200.1416 by Jelmer Vernooij
Don't use experimental mapping by default.
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):
551
        return { "git commit": 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
636
class GitFileIdMap(object):
637
638
    def __init__(self, file_ids, mapping):
639
        self.file_ids = file_ids
640
        self.paths = None
641
        self.mapping = mapping
642
0.200.1569 by Jelmer Vernooij
Implement GitRevisionTree.all_file_ids().
643
    def all_file_ids(self):
644
        return self.file_ids.values()
645
0.200.1201 by Jelmer Vernooij
Implement _set_root_id.
646
    def set_file_id(self, path, file_id):
0.361.1 by Jelmer Vernooij
Don't use assert.
647
        if type(path) is not str:
648
            raise TypeError(path)
7018.3.2 by Jelmer Vernooij
Fix some git tests.
649
        if not isinstance(file_id, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
650
            raise TypeError(file_id)
0.200.1201 by Jelmer Vernooij
Implement _set_root_id.
651
        self.file_ids[path] = file_id
652
0.252.33 by Jelmer Vernooij
Fix file id map lookups.
653
    def lookup_file_id(self, path):
7018.3.2 by Jelmer Vernooij
Fix some git tests.
654
        if not isinstance(path, text_type):
0.361.1 by Jelmer Vernooij
Don't use assert.
655
            raise TypeError(path)
0.252.33 by Jelmer Vernooij
Fix file id map lookups.
656
        try:
0.200.973 by Jelmer Vernooij
Add tests for generate_file_id.
657
            file_id = self.file_ids[path]
0.252.33 by Jelmer Vernooij
Fix file id map lookups.
658
        except KeyError:
0.200.973 by Jelmer Vernooij
Add tests for generate_file_id.
659
            file_id = self.mapping.generate_file_id(path)
7018.3.2 by Jelmer Vernooij
Fix some git tests.
660
        if not isinstance(file_id, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
661
            raise TypeError(file_id)
0.200.973 by Jelmer Vernooij
Add tests for generate_file_id.
662
        return file_id
0.252.33 by Jelmer Vernooij
Fix file id map lookups.
663
664
    def lookup_path(self, file_id):
665
        if self.paths is None:
666
            self.paths = {}
7018.3.2 by Jelmer Vernooij
Fix some git tests.
667
            for k, v in viewitems(self.file_ids):
0.252.33 by Jelmer Vernooij
Fix file id map lookups.
668
                self.paths[v] = k
669
        try:
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
670
            path = self.paths[file_id]
0.252.33 by Jelmer Vernooij
Fix file id map lookups.
671
        except KeyError:
672
            return self.mapping.parse_file_id(file_id)
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
673
        else:
7018.3.2 by Jelmer Vernooij
Fix some git tests.
674
            if not isinstance(path, text_type):
0.361.1 by Jelmer Vernooij
Don't use assert.
675
                raise TypeError(path)
0.200.984 by Jelmer Vernooij
Handle non-ascii characters in filenames.
676
            return path
0.200.1202 by Jelmer Vernooij
Implement has_or_had_id.
677
678
    def copy(self):
679
        return self.__class__(dict(self.file_ids), self.mapping)
0.320.2 by Jelmer Vernooij
Only complain about roundtripping if revisions being pushed didn't originally come from git.
680
681
682
def needs_roundtripping(repo, revid):
683
    try:
684
        mapping_registry.parse_revision_id(revid)
685
    except errors.InvalidRevisionId:
686
        return True
687
    else:
688
        return False