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