/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to repository.py

Merge new dulwich.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
16
16
 
17
17
"""An adapter between a Git Repository and a Bazaar Branch"""
18
18
 
19
 
import git
20
19
import os
21
20
import time
22
21
 
32
31
    urlutils,
33
32
    versionedfile,
34
33
    )
 
34
from bzrlib.foreign import (
 
35
        ForeignRevision,
 
36
        )
35
37
from bzrlib.transport import get_transport
36
38
 
37
 
from bzrlib.plugins.git import (
38
 
    cache,
39
 
    ids,
40
 
    versionedfiles
 
39
from bzrlib.plugins.git.foreign import (
 
40
    ForeignRepository,
 
41
    versionedfiles,
41
42
    )
42
 
 
43
 
 
44
 
class GitRepository(repository.Repository):
 
43
from bzrlib.plugins.git.mapping import default_mapping
 
44
 
 
45
from bzrlib.plugins.git import git
 
46
 
 
47
 
 
48
class GitTags(object):
 
49
 
 
50
    def __init__(self, tags):
 
51
        self._tags = tags
 
52
 
 
53
    def __iter__(self):
 
54
        return iter(self._tags)
 
55
 
 
56
 
 
57
class GitRepository(ForeignRepository):
45
58
    """An adapter to git repositories for bzr."""
46
59
 
47
60
    _serializer = None
51
64
        self.bzrdir = gitdir
52
65
        self.control_files = lockfiles
53
66
        self._git = gitdir._git
54
 
        cache_dir = cache.create_cache_dir()
55
 
        cachedir_transport = get_transport(cache_dir)
56
 
        cache_file = os.path.join(cache_dir, 'cache-%s' % ids.NAMESPACE)
57
67
        self.texts = None
58
68
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
59
69
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
60
70
        self._format = GitFormat()
61
71
        self._fallback_repositories = []
 
72
        self.tags = GitTags(self._git.get_tags())
62
73
 
63
74
    def _all_revision_ids(self):
64
75
        if self._git.heads == []:
70
81
        while cms != []:
71
82
            cms = self._git.commits("--all", max_count=max_count, skip=skip)
72
83
            skip += max_count
73
 
            ret.update([ids.convert_revision_id_git_to_bzr(cm.id) for cm in cms])
 
84
            ret.update([self.get_mapping().revision_id_foreign_to_bzr(cm.id) for cm in cms])
74
85
        return ret
75
86
 
76
87
    def is_shared(self):
92
103
            max_count = 1000
93
104
            cms = None
94
105
            while cms != []:
95
 
                cms = self._git.commits(ids.convert_revision_id_bzr_to_git(revision_id), max_count=max_count, skip=skip)
 
106
                cms = self._git.commits(self.lookup_git_revid(revision_id, self.get_mapping()), max_count=max_count, skip=skip)
96
107
                skip += max_count
97
 
                ret += [ids.convert_revision_id_git_to_bzr(cm.id) for cm in cms]
 
108
                ret += [self.get_mapping().revision_id_foreign_to_bzr(cm.id) for cm in cms]
98
109
        return [None] + ret
99
110
 
100
111
    def get_signature_text(self, revision_id):
101
112
        raise errors.NoSuchRevision(self, revision_id)
102
113
 
 
114
    def lookup_revision_id(self, revid):
 
115
        """Lookup a revision id.
 
116
        
 
117
        :param revid: Bazaar revision id.
 
118
        :return: Tuple with git revisionid and mapping.
 
119
        """
 
120
        # Yes, this doesn't really work, but good enough as a stub
 
121
        return osutils.sha(rev_id).hexdigest(), self.get_mapping()
 
122
 
103
123
    def has_signature_for_revision_id(self, revision_id):
104
124
        return False
105
125
 
 
126
    def get_mapping(self):
 
127
        return default_mapping
 
128
 
106
129
    def get_parent_map(self, revision_ids):
107
130
        ret = {}
108
131
        for revid in revision_ids:
109
132
            if revid == revision.NULL_REVISION:
110
133
                ret[revid] = ()
111
134
            else:
112
 
                commit = self._git.commit(ids.convert_revision_id_bzr_to_git(revid))
113
 
                ret[revid] = tuple([ids.convert_revision_id_git_to_bzr(p.id) for p in commit.parents])
 
135
                git_commit_id = self.lookup_git_revid(revid, self.get_mapping())
 
136
                commit = self._git.commit(git_commit_id)
 
137
                ret[revid] = tuple([self.get_mapping().revision_id_foreign_to_bzr(p.id) for p in commit.parents])
114
138
        return ret
115
139
 
 
140
    def lookup_git_revid(self, bzr_revid, mapping):
 
141
        try:
 
142
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
 
143
        except errors.InvalidRevisionId:
 
144
            raise errors.NoSuchRevision(bzr_revid, self)
 
145
 
116
146
    def get_revision(self, revision_id):
117
 
        git_commit_id = ids.convert_revision_id_bzr_to_git(revision_id)
 
147
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
118
148
        commit = self._git.commit(git_commit_id)
119
149
        # print "fetched revision:", git_commit_id
120
 
        revision = self._parse_rev(commit)
 
150
        revision = self._parse_rev(commit, self.get_mapping())
121
151
        return revision
122
152
 
123
153
    def has_revision(self, revision_id):
132
162
        return [self.get_revision(r) for r in revisions]
133
163
 
134
164
    @classmethod
135
 
    def _parse_rev(klass, commit):
 
165
    def _parse_rev(klass, commit, mapping):
136
166
        """Convert a git commit to a bzr revision.
137
167
 
138
168
        :return: a `bzrlib.revision.Revision` object.
139
169
        """
140
 
        rev = revision.Revision(ids.convert_revision_id_git_to_bzr(commit.id))
141
 
        rev.parent_ids = tuple([ids.convert_revision_id_git_to_bzr(p.id) for p in commit.parents])
142
 
        rev.inventory_sha1 = ""
 
170
        if commit is None:
 
171
            raise AssertionError("Commit object can't be None")
 
172
        rev = ForeignRevision(commit.id, mapping, mapping.revision_id_foreign_to_bzr(commit.id))
 
173
        rev.parent_ids = tuple([mapping.revision_id_foreign_to_bzr(p.id) for p in commit.parents])
143
174
        rev.message = commit.message.decode("utf-8", "replace")
144
 
        rev.committer = str(commit.committer)
145
 
        rev.properties['author'] = str(commit.author)
 
175
        rev.committer = str(commit.committer).decode("utf-8", "replace")
 
176
        rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
146
177
        rev.timestamp = time.mktime(commit.committed_date)
147
178
        rev.timezone = 0
148
179
        return rev
165
196
        assert revision_id != None
166
197
        return self.revision_tree(revision_id).inventory
167
198
 
 
199
    def set_make_working_trees(self, trees):
 
200
        pass
 
201
 
168
202
 
169
203
def escape_file_id(file_id):
170
204
    return file_id.replace('_', '__').replace(' ', '_s')
179
213
    def __init__(self, repository, revision_id):
180
214
        self._repository = repository
181
215
        self.revision_id = revision_id
182
 
        git_id = ids.convert_revision_id_bzr_to_git(revision_id)
 
216
        git_id = repository.lookup_git_revid(revision_id, repository.get_mapping())
183
217
        self.tree = repository._git.commit(git_id).tree
184
218
        self._inventory = inventory.Inventory(revision_id=revision_id)
185
219
        self._inventory.root.revision = revision_id
195
229
 
196
230
    def _build_inventory(self, tree, ie, path):
197
231
        assert isinstance(path, str)
198
 
        for b in tree.contents:
199
 
            basename = b.name.decode("utf-8")
 
232
        for name, mode, hexsha in tree.entries():
 
233
            basename = name.decode("utf-8")
200
234
            if path == "":
201
 
                child_path = b.name
 
235
                child_path = name
202
236
            else:
203
 
                child_path = urlutils.join(path, b.name)
 
237
                child_path = urlutils.join(path, name)
204
238
            file_id = escape_file_id(child_path.encode('utf-8'))
205
 
            if b.mode[0] == '0':
 
239
            if mode[0] == '0':
206
240
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
207
 
            elif b.mode[0] == '1':
208
 
                if b.mode[1] == '0':
 
241
            elif mode[0] == '1':
 
242
                if mode[1] == '0':
209
243
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
210
244
                    child_ie.text_sha1 = osutils.sha_string(b.data)
211
 
                elif b.mode[1] == '2':
 
245
                elif mode[1] == '2':
212
246
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
213
247
                    child_ie.text_sha1 = osutils.sha_string("")
214
248
                else:
215
249
                    raise AssertionError(
216
 
                        "Unknown file kind, perms=%r." % (b.mode,))
 
250
                        "Unknown file kind, perms=%r." % (mode,))
217
251
                child_ie.text_id = b.id
218
252
                child_ie.text_size = b.size
219
253
            else:
220
254
                raise AssertionError(
221
 
                    "Unknown blob kind, perms=%r." % (b.mode,))
222
 
            child_ie.executable = bool(int(b.mode[3:], 8) & 0111)
 
255
                    "Unknown blob kind, perms=%r." % (mode,))
 
256
            child_ie.executable = bool(int(mode[3:], 8) & 0111)
223
257
            child_ie.revision = self.revision_id
224
258
            self._inventory.add(child_ie)
225
 
            if b.mode[0] == '0':
 
259
            if mode[0] == '0':
226
260
                self._build_inventory(b, child_ie, child_path)
227
261
 
228
262