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