/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
2
# Copyright (C) 2008-2009 Jelmer Vernooij <jelmer@samba.org>
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.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.
21
import stat
22
0.200.292 by Jelmer Vernooij
Fix formatting.
23
from bzrlib import (
24
    errors,
25
    foreign,
0.200.356 by Jelmer Vernooij
Fix nasty bug in inventory_to_trees_and_blobs
26
    osutils,
0.200.292 by Jelmer Vernooij
Fix formatting.
27
    urlutils,
28
    )
29
from bzrlib.inventory import (
30
    ROOT_ID,
31
    )
0.200.152 by Jelmer Vernooij
Fix syntax errors.
32
from bzrlib.foreign import (
0.200.292 by Jelmer Vernooij
Fix formatting.
33
    ForeignVcs, 
34
    VcsMappingRegistry, 
35
    ForeignRevision,
36
    )
0.200.329 by Jelmer Vernooij
Fix imports.
37
from bzrlib.xml_serializer import (
38
    escape_invalid_chars,
0.200.309 by Jelmer Vernooij
Add XML escaping to work around serialization bug in bzr.
39
    )
40
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.
41
DEFAULT_FILE_MODE = stat.S_IFREG | 0644
0.200.345 by Jelmer Vernooij
Keep track of file modes to use.
42
0.206.1 by Jelmer Vernooij
Use foreign utility functions.
43
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
44
def escape_file_id(file_id):
45
    return file_id.replace('_', '__').replace(' ', '_s')
46
47
48
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.
49
    ret = []
50
    i = 0
51
    while i < len(file_id):
52
        if file_id[i] != '_':
53
            ret.append(file_id[i])
54
        else:
55
            if file_id[i+1] == '_':
56
                ret.append("_")
57
            elif file_id[i+1] == 's':
58
                ret.append(" ")
59
            else:
60
                raise AssertionError("unknown escape character %s" % file_id[i+1])
61
            i += 1
62
        i += 1
63
    return "".join(ret)
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
64
65
0.200.376 by Jelmer Vernooij
Make sure author and committer names pushed to git contain < and >, otherwise the git parser barfs.
66
def fix_person_identifier(text):
67
    if "<" in text and ">" in text:
68
        return text
69
    return "%s <%s>" % (text, text)
70
71
0.206.1 by Jelmer Vernooij
Use foreign utility functions.
72
class BzrGitMapping(foreign.VcsMapping):
0.200.97 by Jelmer Vernooij
use mapping object.
73
    """Class that maps between Git and Bazaar semantics."""
74
    experimental = False
75
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
76
    def __init__(self):
77
        super(BzrGitMapping, self).__init__(foreign_git)
78
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
79
    def __eq__(self, other):
80
        return type(self) == type(other) and self.revid_prefix == other.revid_prefix
81
82
    @classmethod
83
    def revision_id_foreign_to_bzr(cls, git_rev_id):
0.200.97 by Jelmer Vernooij
use mapping object.
84
        """Convert a git revision id handle to a Bazaar revision id."""
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
85
        return "%s:%s" % (cls.revid_prefix, git_rev_id)
0.200.97 by Jelmer Vernooij
use mapping object.
86
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
87
    @classmethod
88
    def revision_id_bzr_to_foreign(cls, bzr_rev_id):
0.200.97 by Jelmer Vernooij
use mapping object.
89
        """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.
90
        if not bzr_rev_id.startswith("%s:" % cls.revid_prefix):
91
            raise errors.InvalidRevisionId(bzr_rev_id, cls)
92
        return bzr_rev_id[len(cls.revid_prefix)+1:], cls()
0.200.97 by Jelmer Vernooij
use mapping object.
93
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
94
    def generate_file_id(self, path):
0.200.297 by Jelmer Vernooij
Cope with non-ascii characters in filenames (needs a test..).
95
        # Git paths are just bytestrings
96
        # We must just hope they are valid UTF-8..
0.200.157 by Jelmer Vernooij
Fix some bit of fetching.
97
        if path == "":
98
            return ROOT_ID
0.200.297 by Jelmer Vernooij
Cope with non-ascii characters in filenames (needs a test..).
99
        return escape_file_id(path)
0.200.150 by Jelmer Vernooij
Abstract away file id generation.
100
0.230.2 by Jelmer Vernooij
Fix versionedfiles.
101
    def parse_file_id(self, file_id):
102
        if file_id == ROOT_ID:
103
            return ""
104
        return unescape_file_id(file_id)
105
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
106
    def import_commit(self, commit):
107
        """Convert a git commit to a bzr revision.
108
109
        :return: a `bzrlib.revision.Revision` object.
110
        """
111
        if commit is None:
112
            raise AssertionError("Commit object can't be None")
113
        rev = ForeignRevision(commit.id, self, self.revision_id_foreign_to_bzr(commit.id))
114
        rev.parent_ids = tuple([self.revision_id_foreign_to_bzr(p) for p in commit.parents])
0.200.329 by Jelmer Vernooij
Fix imports.
115
        rev.message = escape_invalid_chars(commit.message.decode("utf-8", "replace"))[0]
116
        rev.committer = escape_invalid_chars(str(commit.committer).decode("utf-8", "replace"))[0]
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
117
        if commit.committer != commit.author:
0.200.329 by Jelmer Vernooij
Fix imports.
118
            rev.properties['author'] = escape_invalid_chars(str(commit.author).decode("utf-8", "replace"))[0]
0.200.350 by Jelmer Vernooij
Support author_time
119
120
        if commit.commit_time != commit.author_time:
121
            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.
122
        if commit.commit_timezone != commit.author_timezone:
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
123
            rev.properties['author-timezone'] = "%d" % (commit.author_timezone, )
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
124
        rev.timestamp = commit.commit_time
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
125
        rev.timezone = commit.commit_timezone
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
126
        return rev
127
0.200.97 by Jelmer Vernooij
use mapping object.
128
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
129
class BzrGitMappingv1(BzrGitMapping):
130
    revid_prefix = 'git-v1'
131
    experimental = False
132
0.200.393 by Jelmer Vernooij
Provide __str__ implementation for mapping, fix docstring for ForeignGit.
133
    def __str__(self):
134
        return self.revid_prefix
135
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
136
137
class BzrGitMappingExperimental(BzrGitMappingv1):
0.200.104 by Jelmer Vernooij
Use bzr-foreign function names for converting between git and bzr revids.
138
    revid_prefix = 'git-experimental'
139
    experimental = True
0.200.97 by Jelmer Vernooij
use mapping object.
140
141
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
142
class GitMappingRegistry(VcsMappingRegistry):
143
144
    def revision_id_bzr_to_foreign(self, bzr_revid):
145
        if not bzr_revid.startswith("git-"):
146
            raise errors.InvalidRevisionId(bzr_revid, None)
147
        (mapping_version, git_sha) = bzr_revid.split(":", 1)
148
        mapping = self.get(mapping_version)
149
        return mapping.revision_id_bzr_to_foreign(bzr_revid)
150
151
    parse_revision_id = revision_id_bzr_to_foreign
152
153
154
mapping_registry = GitMappingRegistry()
155
mapping_registry.register_lazy('git-v1', "bzrlib.plugins.git.mapping",
156
                                   "BzrGitMappingv1")
157
mapping_registry.register_lazy('git-experimental', "bzrlib.plugins.git.mapping",
158
                                   "BzrGitMappingExperimental")
159
160
161
class ForeignGit(ForeignVcs):
0.200.393 by Jelmer Vernooij
Provide __str__ implementation for mapping, fix docstring for ForeignGit.
162
    """The Git Stupid Content Tracker"""
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
163
164
    def __init__(self):
165
        super(ForeignGit, self).__init__(mapping_registry)
166
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
167
    @classmethod
168
    def show_foreign_revid(cls, foreign_revid):
169
        return { "git commit": foreign_revid }
170
171
172
foreign_git = ForeignGit()
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
173
default_mapping = BzrGitMappingv1()
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
174
175
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.
176
def text_to_blob(texts, entry):
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
177
    from dulwich.objects import Blob
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.
178
    text = texts.get_record_stream([(entry.file_id, entry.revision)], 'unordered', True).next().get_bytes_as('fulltext')
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
179
    blob = Blob()
180
    blob._text = text
181
    return blob
182
183
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
184
def symlink_to_blob(entry):
185
    from dulwich.objects import Blob
186
    blob = Blob()
187
    blob._text = entry.symlink_target
188
    return blob
189
190
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.
191
def entry_mode(entry):
192
    if entry.kind == 'directory':
193
        return stat.S_IFDIR
194
    elif entry.kind == 'symlink':
195
        return stat.S_IFLNK
196
    elif entry.kind == 'file':
197
        mode = stat.S_IFREG | 0644
198
        if entry.executable:
199
            mode |= 0111
200
        return mode
201
    else:
202
        raise AssertionError
203
204
205
def directory_to_tree(entry, lookup_ie_sha1):
206
    from dulwich.objects import Tree
207
    tree = Tree()
208
    for name in sorted(entry.children.keys()):
209
        ie = entry.children[name]
210
        tree.add(entry_mode(ie), name.encode("utf-8"), lookup_ie_sha1(ie))
211
    tree.serialize()
212
    return tree
213
214
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
215
def inventory_to_tree_and_blobs(inventory, texts, mapping, cur=None):
0.200.355 by Jelmer Vernooij
Allow paranoia checking with -Dverify.
216
    """Convert a Bazaar tree to a Git tree.
217
218
    :return: Yields tuples with object sha1, object and path
219
    """
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
220
    from dulwich.objects import Tree
0.200.213 by Jelmer Vernooij
Move functions to mapping.
221
    import stat
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
222
    stack = []
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
223
    if cur is None:
224
        cur = ""
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
225
    tree = Tree()
226
0.200.220 by Jelmer Vernooij
yield the right path for the tree root.
227
    # stack contains the set of trees that we haven't 
228
    # finished constructing
0.200.349 by Jelmer Vernooij
Specify inventory and texts to inventory_to_tree_and_blobs rather than full repository.
229
    for path, entry in inventory.iter_entries():
0.200.356 by Jelmer Vernooij
Fix nasty bug in inventory_to_trees_and_blobs
230
        while stack and not path.startswith(osutils.pathjoin(cur, "")):
231
            # We've hit a file that's not a child of the previous path
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
232
            tree.serialize()
0.200.318 by Jelmer Vernooij
Use .id rather than .sha().hexdigest().
233
            sha = tree.id
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
234
            yield sha, tree, cur.encode("utf-8")
0.200.219 by Jelmer Vernooij
Fix some issues in tree conversion functions.
235
            t = (stat.S_IFDIR, urlutils.basename(cur).encode('UTF-8'), sha)
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
236
            cur, tree = stack.pop()
237
            tree.add(*t)
238
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
239
        if entry.kind == "directory":
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
240
            stack.append((cur, tree))
241
            cur = path
242
            tree = Tree()
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
243
        else:
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.
244
            if entry.kind == "file":
245
                blob = text_to_blob(texts, entry)
246
            elif entry.kind == "symlink":
247
                blob = symlink_to_blob(entry)
248
            else:
249
                raise AssertionError("Unknown kind %s" % entry.kind)
250
            sha = blob.id
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
251
            yield sha, blob, path.encode("utf-8")
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.
252
            name = urlutils.basename(path).encode("utf-8")
253
            tree.add(entry_mode(entry), name, sha)
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
254
255
    while len(stack) > 1:
256
        tree.serialize()
0.200.318 by Jelmer Vernooij
Use .id rather than .sha().hexdigest().
257
        sha = tree.id
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
258
        yield sha, tree, cur.encode("utf-8")
0.200.219 by Jelmer Vernooij
Fix some issues in tree conversion functions.
259
        t = (stat.S_IFDIR, urlutils.basename(cur).encode('UTF-8'), sha)
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
260
        cur, tree = stack.pop()
261
        tree.add(*t)
262
263
    tree.serialize()
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
264
    yield tree.id, tree, cur.encode("utf-8")
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
265
266
267
def revision_to_commit(rev, tree_sha, parent_lookup):
268
    """Turn a Bazaar revision in to a Git commit
269
270
    :param tree_sha: Tree sha for the commit
271
    :param parent_lookup: Function for looking up the GIT sha equiv of a bzr revision
272
    :return dulwich.objects.Commit represent the revision:
273
    """
274
    from dulwich.objects import Commit
275
    commit = Commit()
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
276
    commit.tree = tree_sha
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
277
    for p in rev.parent_ids:
0.200.222 by Jelmer Vernooij
Dpush works \o/
278
        git_p = parent_lookup(p)
279
        if git_p is not None:
0.200.281 by Jelmer Vernooij
Add extra assert to make sure we don't write invalid parents.
280
            assert len(git_p) == 40, "unexpected length for %r" % git_p
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
281
            commit.parents.append(git_p)
282
    commit.message = rev.message.encode("utf-8")
283
    commit.committer = fix_person_identifier(rev.committer.encode("utf-8"))
284
    commit.author = fix_person_identifier(rev.get_apparent_authors()[0].encode("utf-8"))
285
    commit.commit_time = long(rev.timestamp)
0.200.351 by Jelmer Vernooij
Add roundtrip tests.
286
    if 'author-timestamp' in rev.properties:
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
287
        commit.author_time = long(rev.properties['author-timestamp'])
0.200.350 by Jelmer Vernooij
Support author_time
288
    else:
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
289
        commit.author_time = commit.commit_time
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
290
    commit.commit_timezone = rev.timezone
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.
291
    if 'author-timezone' in rev.properties:
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
292
        commit.author_timezone = int(rev.properties['author-timezone'])
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.
293
    else:
0.200.416 by Jelmer Vernooij
Use public properties to set git objects values.
294
        commit.author_timezone = commit.commit_timezone 
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
295
    return commit