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