/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:
0.200.368 by Jelmer Vernooij
Cope with more granular timezones.
104
            rev.properties['author-timezone'] = "%f" % (commit.author_timezone * .6)
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
105
        rev.timestamp = commit.commit_time
0.200.368 by Jelmer Vernooij
Cope with more granular timezones.
106
        rev.timezone = int(commit.commit_timezone * .6)
107
        if rev.timezone / .6 != commit.commit_timezone:
108
            rev.properties['commit-timezone'] = "%f" % (commit.commit_timezone * .6)
0.200.151 by Jelmer Vernooij
Support converting git objects to bzr objects.
109
        return rev
110
0.200.97 by Jelmer Vernooij
use mapping object.
111
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
112
class BzrGitMappingv1(BzrGitMapping):
113
    revid_prefix = 'git-v1'
114
    experimental = False
115
116
117
class BzrGitMappingExperimental(BzrGitMappingv1):
0.200.104 by Jelmer Vernooij
Use bzr-foreign function names for converting between git and bzr revids.
118
    revid_prefix = 'git-experimental'
119
    experimental = True
0.200.97 by Jelmer Vernooij
use mapping object.
120
121
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
122
class GitMappingRegistry(VcsMappingRegistry):
123
124
    def revision_id_bzr_to_foreign(self, bzr_revid):
125
        if not bzr_revid.startswith("git-"):
126
            raise errors.InvalidRevisionId(bzr_revid, None)
127
        (mapping_version, git_sha) = bzr_revid.split(":", 1)
128
        mapping = self.get(mapping_version)
129
        return mapping.revision_id_bzr_to_foreign(bzr_revid)
130
131
    parse_revision_id = revision_id_bzr_to_foreign
132
133
134
mapping_registry = GitMappingRegistry()
135
mapping_registry.register_lazy('git-v1', "bzrlib.plugins.git.mapping",
136
                                   "BzrGitMappingv1")
137
mapping_registry.register_lazy('git-experimental', "bzrlib.plugins.git.mapping",
138
                                   "BzrGitMappingExperimental")
139
140
141
class ForeignGit(ForeignVcs):
142
    """Foreign Git."""
143
144
    def __init__(self):
145
        super(ForeignGit, self).__init__(mapping_registry)
146
0.200.198 by Jelmer Vernooij
Cope with move of show_foreign_revid.
147
    @classmethod
148
    def show_foreign_revid(cls, foreign_revid):
149
        return { "git commit": foreign_revid }
150
151
152
foreign_git = ForeignGit()
0.200.190 by Jelmer Vernooij
Bless current mapping as v1.
153
default_mapping = BzrGitMappingv1()
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
154
155
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
def text_to_blob(texts, entry):
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
157
    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.
158
    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).
159
    blob = Blob()
160
    blob._text = text
161
    return blob
162
163
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
164
def symlink_to_blob(entry):
165
    from dulwich.objects import Blob
166
    blob = Blob()
167
    blob._text = entry.symlink_target
168
    return blob
169
170
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.
171
def entry_mode(entry):
172
    if entry.kind == 'directory':
173
        return stat.S_IFDIR
174
    elif entry.kind == 'symlink':
175
        return stat.S_IFLNK
176
    elif entry.kind == 'file':
177
        mode = stat.S_IFREG | 0644
178
        if entry.executable:
179
            mode |= 0111
180
        return mode
181
    else:
182
        raise AssertionError
183
184
185
def directory_to_tree(entry, lookup_ie_sha1):
186
    from dulwich.objects import Tree
187
    tree = Tree()
188
    for name in sorted(entry.children.keys()):
189
        ie = entry.children[name]
190
        tree.add(entry_mode(ie), name.encode("utf-8"), lookup_ie_sha1(ie))
191
    tree.serialize()
192
    return tree
193
194
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
195
def inventory_to_tree_and_blobs(inventory, texts, mapping, cur=None):
0.200.355 by Jelmer Vernooij
Allow paranoia checking with -Dverify.
196
    """Convert a Bazaar tree to a Git tree.
197
198
    :return: Yields tuples with object sha1, object and path
199
    """
0.231.2 by Jelmer Vernooij
Add -Dverify flag (not fully implemented yet).
200
    from dulwich.objects import Tree
0.200.213 by Jelmer Vernooij
Move functions to mapping.
201
    import stat
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
202
    stack = []
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
203
    if cur is None:
204
        cur = ""
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
205
    tree = Tree()
206
0.200.220 by Jelmer Vernooij
yield the right path for the tree root.
207
    # stack contains the set of trees that we haven't 
208
    # finished constructing
0.200.349 by Jelmer Vernooij
Specify inventory and texts to inventory_to_tree_and_blobs rather than full repository.
209
    for path, entry in inventory.iter_entries():
0.200.356 by Jelmer Vernooij
Fix nasty bug in inventory_to_trees_and_blobs
210
        while stack and not path.startswith(osutils.pathjoin(cur, "")):
211
            # 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.
212
            tree.serialize()
0.200.318 by Jelmer Vernooij
Use .id rather than .sha().hexdigest().
213
            sha = tree.id
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
214
            yield sha, tree, cur.encode("utf-8")
0.200.219 by Jelmer Vernooij
Fix some issues in tree conversion functions.
215
            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.
216
            cur, tree = stack.pop()
217
            tree.add(*t)
218
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
219
        if entry.kind == "directory":
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
220
            stack.append((cur, tree))
221
            cur = path
222
            tree = Tree()
0.200.354 by Jelmer Vernooij
Support symlinks in conversion to git.
223
        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.
224
            if entry.kind == "file":
225
                blob = text_to_blob(texts, entry)
226
            elif entry.kind == "symlink":
227
                blob = symlink_to_blob(entry)
228
            else:
229
                raise AssertionError("Unknown kind %s" % entry.kind)
230
            sha = blob.id
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
231
            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.
232
            name = urlutils.basename(path).encode("utf-8")
233
            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.
234
235
    while len(stack) > 1:
236
        tree.serialize()
0.200.318 by Jelmer Vernooij
Use .id rather than .sha().hexdigest().
237
        sha = tree.id
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
238
        yield sha, tree, cur.encode("utf-8")
0.200.219 by Jelmer Vernooij
Fix some issues in tree conversion functions.
239
        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.
240
        cur, tree = stack.pop()
241
        tree.add(*t)
242
243
    tree.serialize()
0.200.361 by Jelmer Vernooij
Fix existing object lookup issues when pulling from remote branches.
244
    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.
245
246
247
def revision_to_commit(rev, tree_sha, parent_lookup):
248
    """Turn a Bazaar revision in to a Git commit
249
250
    :param tree_sha: Tree sha for the commit
251
    :param parent_lookup: Function for looking up the GIT sha equiv of a bzr revision
252
    :return dulwich.objects.Commit represent the revision:
253
    """
254
    from dulwich.objects import Commit
255
    commit = Commit()
256
    commit._tree = tree_sha
257
    for p in rev.parent_ids:
0.200.222 by Jelmer Vernooij
Dpush works \o/
258
        git_p = parent_lookup(p)
259
        if git_p is not None:
0.200.281 by Jelmer Vernooij
Add extra assert to make sure we don't write invalid parents.
260
            assert len(git_p) == 40, "unexpected length for %r" % git_p
0.200.222 by Jelmer Vernooij
Dpush works \o/
261
            commit._parents.append(git_p)
0.200.231 by Jelmer Vernooij
Partially fix pull.
262
    commit._message = rev.message.encode("utf-8")
263
    commit._committer = rev.committer.encode("utf-8")
0.200.244 by Jelmer Vernooij
Avoid use of deprecated get_apparent_author.
264
    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.
265
    commit._commit_time = long(rev.timestamp)
0.200.351 by Jelmer Vernooij
Add roundtrip tests.
266
    if 'author-timestamp' in rev.properties:
267
        commit._author_time = long(rev.properties['author-timestamp'])
0.200.350 by Jelmer Vernooij
Support author_time
268
    else:
269
        commit._author_time = commit._commit_time
0.200.368 by Jelmer Vernooij
Cope with more granular timezones.
270
    if 'committer-timezone' in rev.properties:
271
        commit._commit_timezone = int(float(rev.properties['commit-timezone']) / .6)
272
    else:
273
        commit._commit_timezone = int(rev.timezone / .6) 
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.
274
    if 'author-timezone' in rev.properties:
0.200.368 by Jelmer Vernooij
Cope with more granular timezones.
275
        commit._author_timezone = int(float(rev.properties['author-timezone']) / .6)
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.
276
    else:
0.200.368 by Jelmer Vernooij
Cope with more granular timezones.
277
        commit._author_timezone = commit._commit_timezone 
0.200.212 by Jelmer Vernooij
Move conversion functions to mapping, use fetch_objects() from repository if present.
278
    commit.serialize()
279
    return commit