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