/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
1
# Copyright (C) 2007 Canonical Ltd
2
# Copyright (C) 2008-2009 Jelmer Vernooij <jelmer@samba.org>
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
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
19
"""Converters, etc for going between Bazaar and Git ids."""
20
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
21
import base64
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
22
import stat
23
0.200.292 by Jelmer Vernooij
Fix formatting.
24
from bzrlib import (
25
    errors,
26
    foreign,
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
27
    trace,
0.200.292 by Jelmer Vernooij
Fix formatting.
28
    )
0.200.550 by Jelmer Vernooij
Fix import.
29
try:
30
    from bzrlib import bencode
31
except ImportError:
32
    from bzrlib.util import bencode
0.200.292 by Jelmer Vernooij
Fix formatting.
33
from bzrlib.inventory import (
34
    ROOT_ID,
35
    )
0.200.152 by Jelmer Vernooij
Fix syntax errors.
36
from bzrlib.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.701 by Jelmer Vernooij
Fix check in git repos.
41
from bzrlib.revision import (
42
    NULL_REVISION,
43
    )
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
44
from bzrlib.plugins.git.hg import (
45
    format_hg_metadata,
46
    extract_hg_metadata,
47
    )
0.200.309 by Jelmer Vernooij
Add XML escaping to work around serialization bug in bzr.
48
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.
49
DEFAULT_FILE_MODE = stat.S_IFREG | 0644
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
50
0.206.1 by Jelmer Vernooij
Use foreign utility functions.
51
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
52
def escape_file_id(file_id):
53
    return file_id.replace('_', '__').replace(' ', '_s')
54
55
56
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.
57
    ret = []
58
    i = 0
59
    while i < len(file_id):
60
        if file_id[i] != '_':
61
            ret.append(file_id[i])
62
        else:
63
            if file_id[i+1] == '_':
64
                ret.append("_")
65
            elif file_id[i+1] == 's':
66
                ret.append(" ")
67
            else:
0.200.826 by Jelmer Vernooij
Fix some long lines.
68
                raise AssertionError("unknown escape character %s" %
69
                    file_id[i+1])
0.200.390 by Jelmer Vernooij
Fix file id unescape function when there are other underscores in the file id.
70
            i += 1
71
        i += 1
72
    return "".join(ret)
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
73
74
0.200.376 by Jelmer Vernooij
Make sure author and committer names pushed to git contain < and >, otherwise the git parser barfs.
75
def fix_person_identifier(text):
76
    if "<" in text and ">" in text:
77
        return text
78
    return "%s <%s>" % (text, text)
79
80
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
81
def warn_escaped(commit, num_escaped):
82
    trace.warning("Escaped %d XML-invalid characters in %s. Will be unable "
83
                  "to regenerate the SHA map.", num_escaped, commit)
84
85
86
def warn_unusual_mode(commit, path, mode):
0.200.826 by Jelmer Vernooij
Fix some long lines.
87
    trace.mutter("Unusual file mode %o for %s in %s. Storing as revision "
88
                 "property. ", mode, path, commit)
0.200.490 by Jelmer Vernooij
Warn about unusual modes and escaped XML-invalid characters.
89
90
0.200.545 by Jelmer Vernooij
Squash revision data only if necessary.
91
def squash_revision(target_repo, rev):
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
92
    """Remove characters that can't be stored from a revision, if necessary.
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
93
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
94
    :param target_repo: Repository in which the revision will be stored
95
    :param rev: Revision object, will be modified in-place
96
    """
0.200.545 by Jelmer Vernooij
Squash revision data only if necessary.
97
    if not getattr(target_repo._serializer, "squashes_xml_invalid_characters", True):
98
        return
99
    from bzrlib.xml_serializer import escape_invalid_chars
100
    rev.message, num_escaped = escape_invalid_chars(rev.message)
101
    if num_escaped:
102
        warn_escaped(rev.foreign_revid, num_escaped)
103
    if 'author' in rev.properties:
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
104
        rev.properties['author'], num_escaped = escape_invalid_chars(
105
            rev.properties['author'])
0.200.545 by Jelmer Vernooij
Squash revision data only if necessary.
106
        if num_escaped:
107
            warn_escaped(rev.foreign_revid, num_escaped)
108
    rev.committer, num_escaped = escape_invalid_chars(rev.committer)
109
    if num_escaped:
110
        warn_escaped(rev.foreign_revid, num_escaped)
111
112
0.206.1 by Jelmer Vernooij
Use foreign utility functions.
113
class BzrGitMapping(foreign.VcsMapping):
0.200.97 by Jelmer Vernooij
use mapping object.
114
    """Class that maps between Git and Bazaar semantics."""
115
    experimental = False
116
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
117
    def __init__(self):
118
        super(BzrGitMapping, self).__init__(foreign_git)
119
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
120
    def __eq__(self, other):
0.200.726 by Jelmer Vernooij
Factor out conversion of branch names to refs.
121
        return (type(self) == type(other) and 
122
                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.
123
124
    @classmethod
125
    def revision_id_foreign_to_bzr(cls, git_rev_id):
0.200.97 by Jelmer Vernooij
use mapping object.
126
        """Convert a git revision id handle to a Bazaar revision id."""
0.200.769 by Jelmer Vernooij
Cope with open_branch() actually checking whether there is a branch present.
127
        if git_rev_id == "0" * 40:
128
            return NULL_REVISION
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
129
        return "%s:%s" % (cls.revid_prefix, git_rev_id)
0.200.97 by Jelmer Vernooij
use mapping object.
130
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
131
    @classmethod
132
    def revision_id_bzr_to_foreign(cls, bzr_rev_id):
0.200.97 by Jelmer Vernooij
use mapping object.
133
        """Convert a Bazaar revision id to a git revision id handle."""
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
134
        if not bzr_rev_id.startswith("%s:" % cls.revid_prefix):
135
            raise errors.InvalidRevisionId(bzr_rev_id, cls)
136
        return bzr_rev_id[len(cls.revid_prefix)+1:], cls()
0.200.97 by Jelmer Vernooij
use mapping object.
137
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
138
    def generate_file_id(self, path):
0.200.297 by Jelmer Vernooij
Cope with non-ascii characters in filenames (needs a test..).
139
        # Git paths are just bytestrings
140
        # We must just hope they are valid UTF-8..
0.200.157 by Jelmer Vernooij
Fix some bit of fetching.
141
        if path == "":
142
            return ROOT_ID
0.200.297 by Jelmer Vernooij
Cope with non-ascii characters in filenames (needs a test..).
143
        return escape_file_id(path)
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
144
0.230.2 by Jelmer Vernooij
Fix versionedfiles.
145
    def parse_file_id(self, file_id):
146
        if file_id == ROOT_ID:
147
            return ""
148
        return unescape_file_id(file_id)
149
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
150
    def import_unusual_file_modes(self, rev, unusual_file_modes):
151
        if unusual_file_modes:
0.200.878 by Jelmer Vernooij
Fix determining of unusual file modes.
152
            ret = [(path, unusual_file_modes[path])
153
                   for path in sorted(unusual_file_modes.keys())]
0.200.549 by Jelmer Vernooij
Fix storing of unusual file modes.
154
            rev.properties['file-modes'] = bencode.bencode(ret)
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
155
0.200.547 by Jelmer Vernooij
Support getting unusual file modes out of revision properties.
156
    def export_unusual_file_modes(self, rev):
157
        try:
0.200.673 by Jelmer Vernooij
Fix encoding.
158
            return dict([(self.generate_file_id(path), mode) for (path, mode) in bencode.bdecode(rev.properties['file-modes'].encode("utf-8"))])
0.200.547 by Jelmer Vernooij
Support getting unusual file modes out of revision properties.
159
        except KeyError:
160
            return {}
161
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
162
    def _generate_git_svn_metadata(self, rev, encoding):
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
163
        try:
0.200.826 by Jelmer Vernooij
Fix some long lines.
164
            return "\ngit-svn-id: %s\n" % rev.properties["git-svn-id"].encode(
165
                encoding)
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
166
        except KeyError:
167
            return ""
168
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
169
    def _generate_hg_message_tail(self, rev):
170
        extra = {}
171
        renames = []
0.200.639 by Jelmer Vernooij
Support renames in hg-git messages as well.
172
        branch = 'default'
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
173
        for name in rev.properties:
174
            if name == 'hg:extra:branch':
175
                branch = rev.properties['hg:extra:branch']
176
            elif name.startswith('hg:extra'):
0.200.826 by Jelmer Vernooij
Fix some long lines.
177
                extra[name[len('hg:extra:'):]] = base64.b64decode(
178
                    rev.properties[name])
0.200.639 by Jelmer Vernooij
Support renames in hg-git messages as well.
179
            elif name == 'hg:renames':
0.200.826 by Jelmer Vernooij
Fix some long lines.
180
                renames = bencode.bdecode(base64.b64decode(
181
                    rev.properties['hg:renames']))
0.200.639 by Jelmer Vernooij
Support renames in hg-git messages as well.
182
            # TODO: Export other properties as 'bzr:' extras?
0.200.660 by Jelmer Vernooij
Fix encoding issues.
183
        ret = format_hg_metadata(renames, branch, extra)
184
        assert isinstance(ret, str)
185
        return ret
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
186
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
187
    def _extract_git_svn_metadata(self, rev, message):
188
        lines = message.split("\n")
0.200.653 by Jelmer Vernooij
Fix typo in git-svn-id parser, return revnum as integer.
189
        if not (lines[-1] == "" and lines[-2].startswith("git-svn-id:")):
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
190
            return message
0.200.652 by Jelmer Vernooij
Split out git-svn-id parser as separate function, implement ForeignGit.serialize_foreign_revid.
191
        git_svn_id = lines[-2].split(": ", 1)[1]
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
192
        rev.properties['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.
193
        (url, rev, uuid) = parse_git_svn_id(git_svn_id)
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
194
        # FIXME: Convert this to converted-from property somehow..
0.200.660 by Jelmer Vernooij
Fix encoding issues.
195
        ret = "\n".join(lines[:-2])
196
        assert isinstance(ret, str)
197
        return ret
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
198
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
199
    def _extract_hg_metadata(self, rev, message):
200
        (message, renames, branch, extra) = extract_hg_metadata(message)
201
        if branch is not None:
202
            rev.properties['hg:extra:branch'] = branch
203
        for name, value in extra.iteritems():
204
            rev.properties['hg:extra:' + name] = base64.b64encode(value)
0.200.639 by Jelmer Vernooij
Support renames in hg-git messages as well.
205
        if renames:
0.200.826 by Jelmer Vernooij
Fix some long lines.
206
            rev.properties['hg:renames'] = base64.b64encode(bencode.bencode(
207
                [(new, old) for (old, new) in renames.iteritems()]))
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
208
        return message
209
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
210
    def _decode_commit_message(self, rev, message, encoding):
211
        return message.decode(encoding)
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
212
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
213
    def _encode_commit_message(self, rev, message, encoding):
214
        return message.encode(encoding)
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
215
216
    def export_commit(self, rev, tree_sha, parent_lookup):
217
        """Turn a Bazaar revision in to a Git commit
218
219
        :param tree_sha: Tree sha for the commit
0.200.826 by Jelmer Vernooij
Fix some long lines.
220
        :param parent_lookup: Function for looking up the GIT sha equiv of a
221
            bzr revision
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
222
        :return dulwich.objects.Commit represent the revision:
223
        """
224
        from dulwich.objects import Commit
225
        commit = Commit()
226
        commit.tree = tree_sha
227
        for p in rev.parent_ids:
0.200.705 by Jelmer Vernooij
Cope with imports.
228
            try:
229
                git_p = parent_lookup(p)
230
            except KeyError:
231
                git_p = None
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
232
            if git_p is not None:
233
                assert len(git_p) == 40, "unexpected length for %r" % git_p
234
                commit.parents.append(git_p)
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
235
        try:
236
            encoding = rev.properties['git-explicit-encoding']
237
        except KeyError:
238
            encoding = rev.properties.get('git-implicit-encoding', 'utf-8')
239
        commit.encoding = rev.properties.get('git-explicit-encoding')
240
        commit.committer = fix_person_identifier(rev.committer.encode(
241
            encoding))
242
        commit.author = fix_person_identifier(
243
            rev.get_apparent_authors()[0].encode(encoding))
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
244
        commit.commit_time = long(rev.timestamp)
245
        if 'author-timestamp' in rev.properties:
246
            commit.author_time = long(rev.properties['author-timestamp'])
247
        else:
248
            commit.author_time = commit.commit_time
0.200.884 by Jelmer Vernooij
Cope with -0000 as timezone in Git commits.
249
        commit._commit_timezone_neg_utc = "commit-timezone-neg-utc" in rev.properties
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
250
        commit.commit_timezone = rev.timezone
0.200.884 by Jelmer Vernooij
Cope with -0000 as timezone in Git commits.
251
        commit._author_timezone_neg_utc = "author-timezone-neg-utc" in rev.properties
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
252
        if 'author-timezone' in rev.properties:
253
            commit.author_timezone = int(rev.properties['author-timezone'])
254
        else:
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
255
            commit.author_timezone = commit.commit_timezone
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
256
        commit.message = self._encode_commit_message(rev, rev.message, 
257
            encoding)
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
258
        return commit
259
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
260
    def import_commit(self, commit):
261
        """Convert a git commit to a bzr revision.
262
263
        :return: a `bzrlib.revision.Revision` object.
264
        """
265
        if commit is None:
266
            raise AssertionError("Commit object can't be None")
0.200.826 by Jelmer Vernooij
Fix some long lines.
267
        rev = ForeignRevision(commit.id, self,
268
                self.revision_id_foreign_to_bzr(commit.id))
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
269
        rev.parent_ids = tuple([self.revision_id_foreign_to_bzr(p) for p in commit.parents])
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
270
        def decode_using_encoding(rev, commit, encoding):
271
            rev.committer = str(commit.committer).decode(encoding)
272
            if commit.committer != commit.author:
273
                rev.properties['author'] = str(commit.author).decode(encoding)
274
            rev.message = self._decode_commit_message(rev, commit.message, 
275
                encoding)
276
        if commit.encoding is not None:
277
            rev.properties['git-explicit-encoding'] = commit.encoding
278
            decode_using_encoding(rev, commit, commit.encoding)
279
        else:
280
            for encoding in ('utf-8', 'latin1'):
281
                try:
282
                    decode_using_encoding(rev, commit, encoding)
283
                except UnicodeDecodeError:
284
                    pass
285
                else:
286
                    if encoding != 'utf-8':
287
                        rev.properties['git-implicit-encoding'] = encoding
288
                    break
0.200.350 by Jelmer Vernooij
Support author_time
289
        if commit.commit_time != commit.author_time:
290
            rev.properties['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.
291
        if commit.commit_timezone != commit.author_timezone:
0.200.826 by Jelmer Vernooij
Fix some long lines.
292
            rev.properties['author-timezone'] = "%d" % commit.author_timezone
0.200.884 by Jelmer Vernooij
Cope with -0000 as timezone in Git commits.
293
        if commit._author_timezone_neg_utc:
294
            rev.properties['author-timezone-neg-utc'] = ""
295
        if commit._commit_timezone_neg_utc:
296
            rev.properties['commit-timezone-neg-utc'] = ""
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
297
        rev.timestamp = commit.commit_time
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
298
        rev.timezone = commit.commit_timezone
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
299
        return rev
300
0.200.97 by Jelmer Vernooij
use mapping object.
301
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
302
class BzrGitMappingv1(BzrGitMapping):
303
    revid_prefix = 'git-v1'
304
    experimental = False
305
0.200.393 by Jelmer Vernooij
Provide __str__ implementation for mapping, fix docstring for ForeignGit.
306
    def __str__(self):
307
        return self.revid_prefix
308
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
309
310
class BzrGitMappingExperimental(BzrGitMappingv1):
0.200.104 by Jelmer Vernooij
Use bzr-foreign function names for converting between git and bzr revids.
311
    revid_prefix = 'git-experimental'
312
    experimental = True
0.200.97 by Jelmer Vernooij
use mapping object.
313
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
314
    def _decode_commit_message(self, rev, message, encoding):
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
315
        message = self._extract_hg_metadata(rev, message)
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
316
        message = self._extract_git_svn_metadata(rev, message)
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
317
        return message.decode(encoding)
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
318
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
319
    def _encode_commit_message(self, rev, message, encoding):
320
        ret = message.encode(encoding)
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
321
        ret += self._generate_hg_message_tail(rev)
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
322
        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.
323
        return ret
324
0.200.642 by Jelmer Vernooij
In experimental mappings, set 'converted_revision' property.
325
    def import_commit(self, commit):
326
        rev = super(BzrGitMappingExperimental, self).import_commit(commit)
327
        rev.properties['converted_revision'] = "git %s\n" % commit.id
328
        return rev
329
0.200.97 by Jelmer Vernooij
use mapping object.
330
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
331
class GitMappingRegistry(VcsMappingRegistry):
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
332
    """Registry with available git mappings."""
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
333
334
    def revision_id_bzr_to_foreign(self, bzr_revid):
0.200.701 by Jelmer Vernooij
Fix check in git repos.
335
        if bzr_revid == NULL_REVISION:
336
            return "0" * 20, None
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
337
        if not bzr_revid.startswith("git-"):
338
            raise errors.InvalidRevisionId(bzr_revid, None)
339
        (mapping_version, git_sha) = bzr_revid.split(":", 1)
340
        mapping = self.get(mapping_version)
341
        return mapping.revision_id_bzr_to_foreign(bzr_revid)
342
343
    parse_revision_id = revision_id_bzr_to_foreign
344
345
346
mapping_registry = GitMappingRegistry()
347
mapping_registry.register_lazy('git-v1', "bzrlib.plugins.git.mapping",
0.200.826 by Jelmer Vernooij
Fix some long lines.
348
    "BzrGitMappingv1")
349
mapping_registry.register_lazy('git-experimental',
350
    "bzrlib.plugins.git.mapping", "BzrGitMappingExperimental")
0.200.661 by Jelmer Vernooij
Set mapping back to v1.
351
mapping_registry.set_default('git-v1')
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
352
353
354
class ForeignGit(ForeignVcs):
0.200.393 by Jelmer Vernooij
Provide __str__ implementation for mapping, fix docstring for ForeignGit.
355
    """The Git Stupid Content Tracker"""
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
356
0.243.1 by Jelmer Vernooij
Use foreign branch testing infrastructure.
357
    @property
358
    def branch_format(self):
359
        from bzrlib.plugins.git.branch import GitBranchFormat
360
        return GitBranchFormat()
361
0.200.657 by Jelmer Vernooij
Provide repository_format attribute, as required by newer foreign VCS tests in bzrlib.
362
    @property
363
    def repository_format(self):
364
        from bzrlib.plugins.git.repository import GitRepositoryFormat
365
        return GitRepositoryFormat()
366
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
367
    def __init__(self):
368
        super(ForeignGit, self).__init__(mapping_registry)
0.200.646 by Jelmer Vernooij
Store abbreviation in foreign branch.
369
        self.abbreviation = "git"
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
370
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
371
    @classmethod
0.200.652 by Jelmer Vernooij
Split out git-svn-id parser as separate function, implement ForeignGit.serialize_foreign_revid.
372
    def serialize_foreign_revid(self, foreign_revid):
373
        return foreign_revid
374
375
    @classmethod
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
376
    def show_foreign_revid(cls, foreign_revid):
377
        return { "git commit": foreign_revid }
378
379
380
foreign_git = ForeignGit()
0.200.637 by Jelmer Vernooij
Allow single place for configuration of default mapping.
381
default_mapping = mapping_registry.get_default()()
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
382
383
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
384
def symlink_to_blob(entry):
385
    from dulwich.objects import Blob
386
    blob = Blob()
0.200.795 by Jelmer Vernooij
simplify sha extraction for blobs, process multiple blobs at once.
387
    symlink_target = entry.symlink_target
388
    if type(symlink_target) == unicode:
389
        symlink_target = symlink_target.encode('utf-8')
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
390
    blob.data = symlink_target
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
391
    return blob
392
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
393
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
394
def mode_is_executable(mode):
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
395
    """Check if mode should be considered executable."""
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
396
    return bool(mode & 0111)
397
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
398
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
399
def mode_kind(mode):
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
400
    """Determine the Bazaar inventory kind based on Unix file mode."""
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
401
    entry_kind = (mode & 0700000) / 0100000
402
    if entry_kind == 0:
403
        return 'directory'
404
    elif entry_kind == 1:
405
        file_kind = (mode & 070000) / 010000
406
        if file_kind == 0:
407
            return 'file'
408
        elif file_kind == 2:
409
            return 'symlink'
410
        elif file_kind == 6:
411
            return 'tree-reference'
412
        else:
413
            raise AssertionError(
414
                "Unknown file kind %d, perms=%o." % (file_kind, mode,))
415
    else:
416
        raise AssertionError(
417
            "Unknown kind, perms=%r." % (mode,))
418
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
419
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
420
def object_mode(kind, executable):
421
    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.
422
        return stat.S_IFDIR
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
423
    elif kind == 'symlink':
0.245.1 by INADA Naoki
Handle executable mode for symlink.
424
        mode = stat.S_IFLNK
425
        if executable:
0.200.703 by Jelmer Vernooij
Merge support for executable symlinks.
426
            mode |= 0111
0.245.1 by INADA Naoki
Handle executable mode for symlink.
427
        return mode
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
428
    elif kind == 'file':
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.
429
        mode = stat.S_IFREG | 0644
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
430
        if executable:
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.
431
            mode |= 0111
432
        return mode
0.200.665 by Jelmer Vernooij
Add more checks for submodules.
433
    elif kind == 'tree-reference':
434
        from dulwich.objects import S_IFGITLINK
435
        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.
436
    else:
437
        raise AssertionError
438
439
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
440
def entry_mode(entry):
441
    """Determine the git file mode for an inventory entry."""
442
    return object_mode(entry.kind, entry.executable)
443
444
0.200.549 by Jelmer Vernooij
Fix storing of unusual file modes.
445
def directory_to_tree(entry, lookup_ie_sha1, unusual_modes):
0.200.589 by Jelmer Vernooij
Fix handling of empty trees.
446
    from dulwich.objects import Tree
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.
447
    tree = Tree()
0.200.807 by Jelmer Vernooij
Fix test, remove unnecessary sort.
448
    for name, value in entry.children.iteritems():
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.
449
        ie = entry.children[name]
0.200.549 by Jelmer Vernooij
Fix storing of unusual file modes.
450
        try:
451
            mode = unusual_modes[ie.file_id]
452
        except KeyError:
453
            mode = entry_mode(ie)
0.200.808 by Jelmer Vernooij
Avoid recalculating tree shas we already have.
454
        hexsha = lookup_ie_sha1(ie)
0.200.589 by Jelmer Vernooij
Fix handling of empty trees.
455
        if hexsha is not None:
456
            tree.add(mode, name.encode("utf-8"), hexsha)
457
    if entry.parent_id is not None and len(tree) == 0:
458
        # Only the root can be an empty tree
459
        return None
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.
460
    return tree
461
462
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
463
def extract_unusual_modes(rev):
464
    try:
0.200.826 by Jelmer Vernooij
Fix some long lines.
465
        foreign_revid, mapping = mapping_registry.parse_revision_id(
466
            rev.revision_id)
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
467
    except errors.InvalidRevisionId:
468
        return {}
469
    else:
470
        return mapping.export_unusual_file_modes(rev)
471
472
0.200.652 by Jelmer Vernooij
Split out git-svn-id parser as separate function, implement ForeignGit.serialize_foreign_revid.
473
def parse_git_svn_id(text):
474
    (head, uuid) = text.rsplit(" ", 1)
475
    (full_url, rev) = head.rsplit("@", 1)
0.200.653 by Jelmer Vernooij
Fix typo in git-svn-id parser, return revnum as integer.
476
    return (full_url, int(rev), uuid)