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