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