/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.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
99
        rev.timestamp = commit.commit_time
100
        rev.timezone = 0
101
        return rev
102
0.200.97 by Jelmer Vernooij
use mapping object.
103
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
104
class BzrGitMappingv1(BzrGitMapping):
105
    revid_prefix = 'git-v1'
106
    experimental = False
107
108
109
class BzrGitMappingExperimental(BzrGitMappingv1):
0.200.104 by Jelmer Vernooij
Use bzr-foreign function names for converting between git and bzr revids.
110
    revid_prefix = 'git-experimental'
111
    experimental = True
0.200.97 by Jelmer Vernooij
use mapping object.
112
113
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
114
class GitMappingRegistry(VcsMappingRegistry):
115
116
    def revision_id_bzr_to_foreign(self, bzr_revid):
117
        if not bzr_revid.startswith("git-"):
118
            raise errors.InvalidRevisionId(bzr_revid, None)
119
        (mapping_version, git_sha) = bzr_revid.split(":", 1)
120
        mapping = self.get(mapping_version)
121
        return mapping.revision_id_bzr_to_foreign(bzr_revid)
122
123
    parse_revision_id = revision_id_bzr_to_foreign
124
125
126
mapping_registry = GitMappingRegistry()
127
mapping_registry.register_lazy('git-v1', "bzrlib.plugins.git.mapping",
128
                                   "BzrGitMappingv1")
129
mapping_registry.register_lazy('git-experimental', "bzrlib.plugins.git.mapping",
130
                                   "BzrGitMappingExperimental")
131
132
133
class ForeignGit(ForeignVcs):
134
    """Foreign Git."""
135
136
    def __init__(self):
137
        super(ForeignGit, self).__init__(mapping_registry)
138
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
139
    @classmethod
140
    def show_foreign_revid(cls, foreign_revid):
141
        return { "git commit": foreign_revid }
142
143
144
foreign_git = ForeignGit()
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
145
default_mapping = BzrGitMappingv1()
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
146
147
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
148
def text_to_blob(text):
149
    from dulwich.objects import Blob
150
    blob = Blob()
151
    blob._text = text
152
    return blob
153
154
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
155
def inventory_to_tree_and_blobs(repo, mapping, revision_id):
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
156
    from dulwich.objects import Tree
0.200.213 by Jelmer Vernooij
Move functions to mapping.
157
    from bzrlib.inventory import InventoryDirectory, InventoryFile
158
    import stat
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
159
    stack = []
160
    cur = ""
161
    tree = Tree()
162
163
    inv = repo.get_inventory(revision_id)
164
0.200.220 by Jelmer Vernooij
yield the right path for the tree root.
165
    # stack contains the set of trees that we haven't 
166
    # finished constructing
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
167
    for path, entry in inv.iter_entries():
168
        while stack and not path.startswith(cur):
169
            tree.serialize()
0.200.318 by Jelmer Vernooij
Use .id rather than .sha().hexdigest().
170
            sha = tree.id
0.200.221 by Jelmer Vernooij
Add FOSDEM roundtripping notes.
171
            yield sha, tree, cur
0.200.219 by Jelmer Vernooij
Fix some issues in tree conversion functions.
172
            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.
173
            cur, tree = stack.pop()
174
            tree.add(*t)
175
176
        if type(entry) == InventoryDirectory:
177
            stack.append((cur, tree))
178
            cur = path
179
            tree = Tree()
180
181
        if type(entry) == InventoryFile:
182
            #FIXME: We can make potentially make this Lazy to avoid shaing lots of stuff
183
            # and having all these objects in memory at once
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
184
            text = repo.texts.get_record_stream([(entry.file_id, entry.revision)], 'unordered', True).next().get_bytes_as('fulltext')
185
            blob = text_to_blob(text)
0.200.318 by Jelmer Vernooij
Use .id rather than .sha().hexdigest().
186
            sha = blob.id
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
187
            yield sha, blob, path
188
0.200.219 by Jelmer Vernooij
Fix some issues in tree conversion functions.
189
            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.
190
            mode = stat.S_IFREG | 0644
191
            if entry.executable:
192
                mode |= 0111
193
            tree.add(mode, name, sha)
194
195
    while len(stack) > 1:
196
        tree.serialize()
0.200.318 by Jelmer Vernooij
Use .id rather than .sha().hexdigest().
197
        sha = tree.id
0.200.221 by Jelmer Vernooij
Add FOSDEM roundtripping notes.
198
        yield sha, tree, cur
0.200.219 by Jelmer Vernooij
Fix some issues in tree conversion functions.
199
        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.
200
        cur, tree = stack.pop()
201
        tree.add(*t)
202
203
    tree.serialize()
0.200.318 by Jelmer Vernooij
Use .id rather than .sha().hexdigest().
204
    yield tree.id, tree, cur
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
205
206
207
def revision_to_commit(rev, tree_sha, parent_lookup):
208
    """Turn a Bazaar revision in to a Git commit
209
210
    :param tree_sha: Tree sha for the commit
211
    :param parent_lookup: Function for looking up the GIT sha equiv of a bzr revision
212
    :return dulwich.objects.Commit represent the revision:
213
    """
214
    from dulwich.objects import Commit
215
    commit = Commit()
216
    commit._tree = tree_sha
217
    for p in rev.parent_ids:
0.200.222 by Jelmer Vernooij
Dpush works \o/
218
        git_p = parent_lookup(p)
219
        if git_p is not None:
0.200.281 by Jelmer Vernooij
Add extra assert to make sure we don't write invalid parents.
220
            assert len(git_p) == 40, "unexpected length for %r" % git_p
0.200.222 by Jelmer Vernooij
Dpush works \o/
221
            commit._parents.append(git_p)
0.200.231 by Jelmer Vernooij
Partially fix pull.
222
    commit._message = rev.message.encode("utf-8")
223
    commit._committer = rev.committer.encode("utf-8")
0.200.244 by Jelmer Vernooij
Avoid use of deprecated get_apparent_author.
224
    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.
225
    commit._commit_time = long(rev.timestamp)
226
    commit.serialize()
227
    return commit