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