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