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