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