/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.891 by Jelmer Vernooij
Use ZERO_SHA constant where possible.
127
        from dulwich.protocol import ZERO_SHA
128
        if git_rev_id == ZERO_SHA:
0.200.769 by Jelmer Vernooij
Cope with open_branch() actually checking whether there is a branch present.
129
            return NULL_REVISION
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
130
        return "%s:%s" % (cls.revid_prefix, git_rev_id)
0.200.97 by Jelmer Vernooij
use mapping object.
131
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
132
    @classmethod
133
    def revision_id_bzr_to_foreign(cls, bzr_rev_id):
0.200.97 by Jelmer Vernooij
use mapping object.
134
        """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.
135
        if not bzr_rev_id.startswith("%s:" % cls.revid_prefix):
136
            raise errors.InvalidRevisionId(bzr_rev_id, cls)
137
        return bzr_rev_id[len(cls.revid_prefix)+1:], cls()
0.200.97 by Jelmer Vernooij
use mapping object.
138
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
139
    def generate_file_id(self, path):
0.200.297 by Jelmer Vernooij
Cope with non-ascii characters in filenames (needs a test..).
140
        # Git paths are just bytestrings
141
        # We must just hope they are valid UTF-8..
0.200.157 by Jelmer Vernooij
Fix some bit of fetching.
142
        if path == "":
143
            return ROOT_ID
0.200.297 by Jelmer Vernooij
Cope with non-ascii characters in filenames (needs a test..).
144
        return escape_file_id(path)
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
145
0.230.2 by Jelmer Vernooij
Fix versionedfiles.
146
    def parse_file_id(self, file_id):
147
        if file_id == ROOT_ID:
148
            return ""
149
        return unescape_file_id(file_id)
150
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
151
    def import_unusual_file_modes(self, rev, unusual_file_modes):
152
        if unusual_file_modes:
0.200.878 by Jelmer Vernooij
Fix determining of unusual file modes.
153
            ret = [(path, unusual_file_modes[path])
154
                   for path in sorted(unusual_file_modes.keys())]
0.200.549 by Jelmer Vernooij
Fix storing of unusual file modes.
155
            rev.properties['file-modes'] = bencode.bencode(ret)
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
156
0.200.547 by Jelmer Vernooij
Support getting unusual file modes out of revision properties.
157
    def export_unusual_file_modes(self, rev):
158
        try:
0.200.894 by Jelmer Vernooij
Simplify formatting a bit.
159
            file_modes = rev.properties['file-modes']
0.200.547 by Jelmer Vernooij
Support getting unusual file modes out of revision properties.
160
        except KeyError:
161
            return {}
0.200.894 by Jelmer Vernooij
Simplify formatting a bit.
162
        else:
163
            return dict([(self.generate_file_id(path), mode) for (path, mode) in bencode.bdecode(file_modes.encode("utf-8"))])
0.200.547 by Jelmer Vernooij
Support getting unusual file modes out of revision properties.
164
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
165
    def _generate_git_svn_metadata(self, rev, encoding):
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
166
        try:
0.200.894 by Jelmer Vernooij
Simplify formatting a bit.
167
            git_svn_id = rev.properties["git-svn-id"]
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
168
        except KeyError:
169
            return ""
0.200.894 by Jelmer Vernooij
Simplify formatting a bit.
170
        else:
171
            return "\ngit-svn-id: %s\n" % git_svn_id.encode(encoding)
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
172
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
173
    def _generate_hg_message_tail(self, rev):
174
        extra = {}
175
        renames = []
0.200.639 by Jelmer Vernooij
Support renames in hg-git messages as well.
176
        branch = 'default'
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
177
        for name in rev.properties:
178
            if name == 'hg:extra:branch':
179
                branch = rev.properties['hg:extra:branch']
180
            elif name.startswith('hg:extra'):
0.200.826 by Jelmer Vernooij
Fix some long lines.
181
                extra[name[len('hg:extra:'):]] = base64.b64decode(
182
                    rev.properties[name])
0.200.639 by Jelmer Vernooij
Support renames in hg-git messages as well.
183
            elif name == 'hg:renames':
0.200.826 by Jelmer Vernooij
Fix some long lines.
184
                renames = bencode.bdecode(base64.b64decode(
185
                    rev.properties['hg:renames']))
0.200.639 by Jelmer Vernooij
Support renames in hg-git messages as well.
186
            # TODO: Export other properties as 'bzr:' extras?
0.200.660 by Jelmer Vernooij
Fix encoding issues.
187
        ret = format_hg_metadata(renames, branch, extra)
188
        assert isinstance(ret, str)
189
        return ret
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
190
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
191
    def _extract_git_svn_metadata(self, rev, message):
192
        lines = message.split("\n")
0.200.653 by Jelmer Vernooij
Fix typo in git-svn-id parser, return revnum as integer.
193
        if not (lines[-1] == "" and lines[-2].startswith("git-svn-id:")):
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
194
            return message
0.200.652 by Jelmer Vernooij
Split out git-svn-id parser as separate function, implement ForeignGit.serialize_foreign_revid.
195
        git_svn_id = lines[-2].split(": ", 1)[1]
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
196
        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.
197
        (url, rev, uuid) = parse_git_svn_id(git_svn_id)
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
198
        # FIXME: Convert this to converted-from property somehow..
0.200.660 by Jelmer Vernooij
Fix encoding issues.
199
        ret = "\n".join(lines[:-2])
200
        assert isinstance(ret, str)
201
        return ret
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
202
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
203
    def _extract_hg_metadata(self, rev, message):
204
        (message, renames, branch, extra) = extract_hg_metadata(message)
205
        if branch is not None:
206
            rev.properties['hg:extra:branch'] = branch
207
        for name, value in extra.iteritems():
208
            rev.properties['hg:extra:' + name] = base64.b64encode(value)
0.200.639 by Jelmer Vernooij
Support renames in hg-git messages as well.
209
        if renames:
0.200.826 by Jelmer Vernooij
Fix some long lines.
210
            rev.properties['hg:renames'] = base64.b64encode(bencode.bencode(
211
                [(new, old) for (old, new) in renames.iteritems()]))
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
212
        return message
213
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
214
    def _decode_commit_message(self, rev, message, encoding):
215
        return message.decode(encoding)
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
216
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
217
    def _encode_commit_message(self, rev, message, encoding):
218
        return message.encode(encoding)
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
219
220
    def export_commit(self, rev, tree_sha, parent_lookup):
221
        """Turn a Bazaar revision in to a Git commit
222
223
        :param tree_sha: Tree sha for the commit
0.200.826 by Jelmer Vernooij
Fix some long lines.
224
        :param parent_lookup: Function for looking up the GIT sha equiv of a
225
            bzr revision
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
226
        :return dulwich.objects.Commit represent the revision:
227
        """
228
        from dulwich.objects import Commit
229
        commit = Commit()
230
        commit.tree = tree_sha
231
        for p in rev.parent_ids:
0.200.705 by Jelmer Vernooij
Cope with imports.
232
            try:
233
                git_p = parent_lookup(p)
234
            except KeyError:
235
                git_p = None
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
236
            if git_p is not None:
237
                assert len(git_p) == 40, "unexpected length for %r" % git_p
238
                commit.parents.append(git_p)
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
239
        try:
240
            encoding = rev.properties['git-explicit-encoding']
241
        except KeyError:
242
            encoding = rev.properties.get('git-implicit-encoding', 'utf-8')
243
        commit.encoding = rev.properties.get('git-explicit-encoding')
244
        commit.committer = fix_person_identifier(rev.committer.encode(
245
            encoding))
246
        commit.author = fix_person_identifier(
247
            rev.get_apparent_authors()[0].encode(encoding))
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
248
        commit.commit_time = long(rev.timestamp)
249
        if 'author-timestamp' in rev.properties:
250
            commit.author_time = long(rev.properties['author-timestamp'])
251
        else:
252
            commit.author_time = commit.commit_time
0.200.884 by Jelmer Vernooij
Cope with -0000 as timezone in Git commits.
253
        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.
254
        commit.commit_timezone = rev.timezone
0.200.884 by Jelmer Vernooij
Cope with -0000 as timezone in Git commits.
255
        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.
256
        if 'author-timezone' in rev.properties:
257
            commit.author_timezone = int(rev.properties['author-timezone'])
258
        else:
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
259
            commit.author_timezone = commit.commit_timezone
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
260
        commit.message = self._encode_commit_message(rev, rev.message, 
261
            encoding)
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
262
        return commit
263
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
264
    def import_commit(self, commit):
265
        """Convert a git commit to a bzr revision.
266
267
        :return: a `bzrlib.revision.Revision` object.
268
        """
269
        if commit is None:
270
            raise AssertionError("Commit object can't be None")
0.200.826 by Jelmer Vernooij
Fix some long lines.
271
        rev = ForeignRevision(commit.id, self,
272
                self.revision_id_foreign_to_bzr(commit.id))
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
273
        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
274
        def decode_using_encoding(rev, commit, encoding):
275
            rev.committer = str(commit.committer).decode(encoding)
276
            if commit.committer != commit.author:
277
                rev.properties['author'] = str(commit.author).decode(encoding)
278
            rev.message = self._decode_commit_message(rev, commit.message, 
279
                encoding)
280
        if commit.encoding is not None:
281
            rev.properties['git-explicit-encoding'] = commit.encoding
282
            decode_using_encoding(rev, commit, commit.encoding)
283
        else:
284
            for encoding in ('utf-8', 'latin1'):
285
                try:
286
                    decode_using_encoding(rev, commit, encoding)
287
                except UnicodeDecodeError:
288
                    pass
289
                else:
290
                    if encoding != 'utf-8':
291
                        rev.properties['git-implicit-encoding'] = encoding
292
                    break
0.200.350 by Jelmer Vernooij
Support author_time
293
        if commit.commit_time != commit.author_time:
294
            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.
295
        if commit.commit_timezone != commit.author_timezone:
0.200.826 by Jelmer Vernooij
Fix some long lines.
296
            rev.properties['author-timezone'] = "%d" % commit.author_timezone
0.200.884 by Jelmer Vernooij
Cope with -0000 as timezone in Git commits.
297
        if commit._author_timezone_neg_utc:
298
            rev.properties['author-timezone-neg-utc'] = ""
299
        if commit._commit_timezone_neg_utc:
300
            rev.properties['commit-timezone-neg-utc'] = ""
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
301
        rev.timestamp = commit.commit_time
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
302
        rev.timezone = commit.commit_timezone
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
303
        return rev
304
0.200.97 by Jelmer Vernooij
use mapping object.
305
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
306
class BzrGitMappingv1(BzrGitMapping):
307
    revid_prefix = 'git-v1'
308
    experimental = False
309
0.200.393 by Jelmer Vernooij
Provide __str__ implementation for mapping, fix docstring for ForeignGit.
310
    def __str__(self):
311
        return self.revid_prefix
312
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
313
314
class BzrGitMappingExperimental(BzrGitMappingv1):
0.200.104 by Jelmer Vernooij
Use bzr-foreign function names for converting between git and bzr revids.
315
    revid_prefix = 'git-experimental'
316
    experimental = True
0.200.97 by Jelmer Vernooij
use mapping object.
317
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
318
    def _decode_commit_message(self, rev, message, encoding):
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
319
        message = self._extract_hg_metadata(rev, message)
0.200.643 by Jelmer Vernooij
Attempt to parse git-svn-id metadata.
320
        message = self._extract_git_svn_metadata(rev, message)
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
321
        return message.decode(encoding)
0.242.1 by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings.
322
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
323
    def _encode_commit_message(self, rev, message, encoding):
324
        ret = message.encode(encoding)
0.200.638 by Jelmer Vernooij
Abstract support for hg-git metadata.
325
        ret += self._generate_hg_message_tail(rev)
0.200.727 by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out
326
        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.
327
        return ret
328
0.200.642 by Jelmer Vernooij
In experimental mappings, set 'converted_revision' property.
329
    def import_commit(self, commit):
330
        rev = super(BzrGitMappingExperimental, self).import_commit(commit)
331
        rev.properties['converted_revision'] = "git %s\n" % commit.id
332
        return rev
333
0.200.97 by Jelmer Vernooij
use mapping object.
334
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
335
class GitMappingRegistry(VcsMappingRegistry):
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
336
    """Registry with available git mappings."""
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
337
338
    def revision_id_bzr_to_foreign(self, bzr_revid):
0.200.701 by Jelmer Vernooij
Fix check in git repos.
339
        if bzr_revid == NULL_REVISION:
0.200.892 by Jelmer Vernooij
Lazy import ZERO_SHA.
340
            from dulwich.protocol import ZERO_SHA
0.200.891 by Jelmer Vernooij
Use ZERO_SHA constant where possible.
341
            return ZERO_SHA, None
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
342
        if not bzr_revid.startswith("git-"):
343
            raise errors.InvalidRevisionId(bzr_revid, None)
344
        (mapping_version, git_sha) = bzr_revid.split(":", 1)
345
        mapping = self.get(mapping_version)
346
        return mapping.revision_id_bzr_to_foreign(bzr_revid)
347
348
    parse_revision_id = revision_id_bzr_to_foreign
349
350
351
mapping_registry = GitMappingRegistry()
352
mapping_registry.register_lazy('git-v1', "bzrlib.plugins.git.mapping",
0.200.826 by Jelmer Vernooij
Fix some long lines.
353
    "BzrGitMappingv1")
354
mapping_registry.register_lazy('git-experimental',
355
    "bzrlib.plugins.git.mapping", "BzrGitMappingExperimental")
0.200.661 by Jelmer Vernooij
Set mapping back to v1.
356
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.
357
358
359
class ForeignGit(ForeignVcs):
0.200.393 by Jelmer Vernooij
Provide __str__ implementation for mapping, fix docstring for ForeignGit.
360
    """The Git Stupid Content Tracker"""
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
361
0.243.1 by Jelmer Vernooij
Use foreign branch testing infrastructure.
362
    @property
363
    def branch_format(self):
364
        from bzrlib.plugins.git.branch import GitBranchFormat
365
        return GitBranchFormat()
366
0.200.657 by Jelmer Vernooij
Provide repository_format attribute, as required by newer foreign VCS tests in bzrlib.
367
    @property
368
    def repository_format(self):
369
        from bzrlib.plugins.git.repository import GitRepositoryFormat
370
        return GitRepositoryFormat()
371
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
372
    def __init__(self):
373
        super(ForeignGit, self).__init__(mapping_registry)
0.200.646 by Jelmer Vernooij
Store abbreviation in foreign branch.
374
        self.abbreviation = "git"
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
375
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
376
    @classmethod
0.200.652 by Jelmer Vernooij
Split out git-svn-id parser as separate function, implement ForeignGit.serialize_foreign_revid.
377
    def serialize_foreign_revid(self, foreign_revid):
378
        return foreign_revid
379
380
    @classmethod
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
381
    def show_foreign_revid(cls, foreign_revid):
382
        return { "git commit": foreign_revid }
383
384
385
foreign_git = ForeignGit()
0.200.637 by Jelmer Vernooij
Allow single place for configuration of default mapping.
386
default_mapping = mapping_registry.get_default()()
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
387
388
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
389
def symlink_to_blob(entry):
390
    from dulwich.objects import Blob
391
    blob = Blob()
0.200.795 by Jelmer Vernooij
simplify sha extraction for blobs, process multiple blobs at once.
392
    symlink_target = entry.symlink_target
393
    if type(symlink_target) == unicode:
394
        symlink_target = symlink_target.encode('utf-8')
0.200.798 by Jelmer Vernooij
Split out _inventory_to_objects into a function.
395
    blob.data = symlink_target
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
396
    return blob
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_is_executable(mode):
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
400
    """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.
401
    return bool(mode & 0111)
402
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
403
0.200.521 by Jelmer Vernooij
Abstract out kind mapping a bit, initial work on support tree-references.
404
def mode_kind(mode):
0.200.546 by Jelmer Vernooij
Add more docstrings, support storing unusual file modes.
405
    """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.
406
    entry_kind = (mode & 0700000) / 0100000
407
    if entry_kind == 0:
408
        return 'directory'
409
    elif entry_kind == 1:
410
        file_kind = (mode & 070000) / 010000
411
        if file_kind == 0:
412
            return 'file'
413
        elif file_kind == 2:
414
            return 'symlink'
415
        elif file_kind == 6:
416
            return 'tree-reference'
417
        else:
418
            raise AssertionError(
419
                "Unknown file kind %d, perms=%o." % (file_kind, mode,))
420
    else:
421
        raise AssertionError(
422
            "Unknown kind, perms=%r." % (mode,))
423
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
424
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
425
def object_mode(kind, executable):
426
    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.
427
        return stat.S_IFDIR
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
428
    elif kind == 'symlink':
0.245.1 by INADA Naoki
Handle executable mode for symlink.
429
        mode = stat.S_IFLNK
430
        if executable:
0.200.703 by Jelmer Vernooij
Merge support for executable symlinks.
431
            mode |= 0111
0.245.1 by INADA Naoki
Handle executable mode for symlink.
432
        return mode
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
433
    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.
434
        mode = stat.S_IFREG | 0644
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
435
        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.
436
            mode |= 0111
437
        return mode
0.200.665 by Jelmer Vernooij
Add more checks for submodules.
438
    elif kind == 'tree-reference':
439
        from dulwich.objects import S_IFGITLINK
440
        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.
441
    else:
442
        raise AssertionError
443
444
0.238.6 by Jelmer Vernooij
Support sending git am-style patches with "bzr send --format=git".
445
def entry_mode(entry):
446
    """Determine the git file mode for an inventory entry."""
447
    return object_mode(entry.kind, entry.executable)
448
449
0.200.549 by Jelmer Vernooij
Fix storing of unusual file modes.
450
def directory_to_tree(entry, lookup_ie_sha1, unusual_modes):
0.200.589 by Jelmer Vernooij
Fix handling of empty trees.
451
    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.
452
    tree = Tree()
0.200.807 by Jelmer Vernooij
Fix test, remove unnecessary sort.
453
    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.
454
        ie = entry.children[name]
0.200.549 by Jelmer Vernooij
Fix storing of unusual file modes.
455
        try:
456
            mode = unusual_modes[ie.file_id]
457
        except KeyError:
458
            mode = entry_mode(ie)
0.200.808 by Jelmer Vernooij
Avoid recalculating tree shas we already have.
459
        hexsha = lookup_ie_sha1(ie)
0.200.589 by Jelmer Vernooij
Fix handling of empty trees.
460
        if hexsha is not None:
461
            tree.add(mode, name.encode("utf-8"), hexsha)
462
    if entry.parent_id is not None and len(tree) == 0:
463
        # Only the root can be an empty tree
464
        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.
465
    return tree
466
467
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
468
def extract_unusual_modes(rev):
469
    try:
0.200.826 by Jelmer Vernooij
Fix some long lines.
470
        foreign_revid, mapping = mapping_registry.parse_revision_id(
471
            rev.revision_id)
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
472
    except errors.InvalidRevisionId:
473
        return {}
474
    else:
475
        return mapping.export_unusual_file_modes(rev)
476
477
0.200.652 by Jelmer Vernooij
Split out git-svn-id parser as separate function, implement ForeignGit.serialize_foreign_revid.
478
def parse_git_svn_id(text):
479
    (head, uuid) = text.rsplit(" ", 1)
480
    (full_url, rev) = head.rsplit("@", 1)
0.200.653 by Jelmer Vernooij
Fix typo in git-svn-id parser, return revnum as integer.
481
    return (full_url, int(rev), uuid)