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