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