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