/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 foreign branch utility code.

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
19
20
import os
20
21
import time
21
22
 
22
23
import bzrlib
23
24
from bzrlib import (
 
25
    deprecated_graph,
24
26
    errors,
25
 
    graph,
26
27
    inventory,
27
28
    osutils,
28
29
    repository,
29
30
    revision,
30
31
    revisiontree,
31
 
    ui,
32
32
    urlutils,
 
33
    versionedfile,
33
34
    )
34
 
from bzrlib.foreign import (
35
 
        ForeignRepository,
36
 
        )
37
 
from bzrlib.trace import mutter
38
35
from bzrlib.transport import get_transport
39
36
 
40
 
from bzrlib.plugins.git.foreign import (
41
 
    versionedfiles,
 
37
from bzrlib.plugins.git import (
 
38
    versionedfiles
42
39
    )
43
 
from bzrlib.plugins.git.mapping import default_mapping, mapping_registry
44
 
from bzrlib.plugins.git.versionedfiles import GitTexts
45
 
 
46
 
import dulwich as git
47
 
 
48
 
 
49
 
class GitTags(object):
50
 
 
51
 
    def __init__(self, tags):
52
 
        self._tags = tags
53
 
 
54
 
    def __iter__(self):
55
 
        return iter(self._tags)
56
 
 
57
 
 
58
 
class GitRepository(ForeignRepository):
 
40
from bzrlib.plugins.git.mapping import default_mapping
 
41
 
 
42
 
 
43
class GitRepository(repository.Repository):
59
44
    """An adapter to git repositories for bzr."""
60
45
 
61
46
    _serializer = None
62
47
 
63
48
    def __init__(self, gitdir, lockfiles):
64
 
        ForeignRepository.__init__(self, GitFormat(), gitdir, lockfiles)
65
 
        from bzrlib.plugins.git import fetch
66
 
        repository.InterRepository.register_optimiser(fetch.InterGitRepository)
67
 
        repository.InterRepository.register_optimiser(fetch.InterGitNonGitRepository)
68
 
 
69
 
    def is_shared(self):
70
 
        return True
71
 
 
72
 
    def supports_rich_root(self):
73
 
        return True
74
 
 
75
 
    def _warn_if_deprecated(self):
76
 
        # This class isn't deprecated
77
 
        pass
78
 
 
79
 
    def get_mapping(self):
80
 
        return default_mapping
81
 
 
82
 
    def make_working_trees(self):
83
 
        return True
84
 
 
85
 
 
86
 
class LocalGitRepository(GitRepository):
87
 
 
88
 
    def __init__(self, gitdir, lockfiles):
89
 
        # FIXME: This also caches negatives. Need to be more careful 
90
 
        # about this once we start writing to git
91
 
        self._parents_provider = graph.CachingParentsProvider(self)
92
 
        GitRepository.__init__(self, gitdir, lockfiles)
93
49
        self.base = gitdir.root_transport.base
 
50
        self.bzrdir = gitdir
 
51
        self.control_files = lockfiles
94
52
        self._git = gitdir._git
95
53
        self.texts = None
96
54
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
97
55
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
98
 
        self.inventories = versionedfiles.VirtualInventoryTexts(self)
99
 
        self.texts = GitTexts(self)
100
 
        self.tags = GitTags(self._git.get_tags())
 
56
        self._format = GitFormat()
 
57
        self._fallback_repositories = []
101
58
 
102
 
    def all_revision_ids(self):
103
 
        ret = set([revision.NULL_REVISION])
104
 
        if self._git.heads() == []:
105
 
            return ret
106
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
107
 
        ret = set(bzr_heads)
108
 
        graph = self.get_graph()
109
 
        for rev, parents in graph.iter_ancestry(bzr_heads):
110
 
            ret.add(rev)
 
59
    def _all_revision_ids(self):
 
60
        if self._git.heads == []:
 
61
            return set()
 
62
        ret = set()
 
63
        skip = 0
 
64
        max_count = 1000
 
65
        cms = None
 
66
        while cms != []:
 
67
            cms = self._git.commits("--all", max_count=max_count, skip=skip)
 
68
            skip += max_count
 
69
            ret.update([default_mapping.convert_revision_id_git_to_bzr(cm.id) for cm in cms])
111
70
        return ret
112
71
 
 
72
    def is_shared(self):
 
73
        return True
 
74
 
 
75
    def supports_rich_root(self):
 
76
        return False
 
77
 
113
78
    #def get_revision_delta(self, revision_id):
114
79
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
115
80
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
116
81
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
117
82
 
118
 
    def _make_parents_provider(self):
119
 
        """See Repository._make_parents_provider()."""
120
 
        return self._parents_provider
121
 
 
122
 
    def get_parent_map(self, revids):
123
 
        parent_map = {}
124
 
        mutter("get_parent_map(%r)", revids)
125
 
        for revision_id in revids:
126
 
            assert isinstance(revision_id, str)
127
 
            if revision_id == revision.NULL_REVISION:
128
 
                parent_map[revision_id] = ()
129
 
                continue
130
 
            hexsha, mapping = self.lookup_git_revid(revision_id)
131
 
            commit  = self._git.commit(hexsha)
132
 
            if commit is None:
133
 
                continue
134
 
            else:
135
 
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
136
 
        return parent_map
137
 
 
138
 
    def get_ancestry(self, revision_id, topo_sorted=True):
139
 
        """See Repository.get_ancestry().
140
 
        """
141
 
        if revision_id is None:
142
 
            return self._all_revision_ids()
143
 
        assert isinstance(revision_id, str)
144
 
        ancestry = []
145
 
        graph = self.get_graph()
146
 
        for rev, parents in graph.iter_ancestry([revision_id]):
147
 
            if rev == revision.NULL_REVISION:
148
 
                rev = None
149
 
            ancestry.append(rev)
150
 
        ancestry.reverse()
151
 
        return ancestry
152
 
 
153
 
    def import_revision_gist(self, source, revid):
154
 
        pass
155
 
 
156
 
    def dfetch(self, source, stop_revision):
157
 
        if stop_revision is None:
158
 
            raise NotImplementedError
159
 
        revidmap = {}
160
 
        todo = []
161
 
        source.lock_read()
162
 
        try:
163
 
            graph = source.get_graph()
164
 
            for revid, parents in graph.iter_ancestry([stop_revision]):
165
 
                if not self.has_revision(revid):
166
 
                    todo.append(revid)
167
 
            pb = ui.ui_factory.nested_progress_bar()
168
 
            try:
169
 
                for i, revid in enumerate(reversed(todo)):
170
 
                    pb.update("pushing revisions", i, len(todo))
171
 
                    revidmap[revid] = self.import_revision_gist(source, revid)
172
 
            finally:
173
 
                pb.finished()
174
 
        finally:
175
 
            source.unlock()
176
 
        return revidmap
 
83
    def get_ancestry(self, revision_id):
 
84
        revision_id = revision.ensure_null(revision_id)
 
85
        ret = []
 
86
        if revision_id != revision.NULL_REVISION:
 
87
            skip = 0
 
88
            max_count = 1000
 
89
            cms = None
 
90
            while cms != []:
 
91
                cms = self._git.commits(default_mapping.convert_revision_id_bzr_to_git(revision_id), max_count=max_count, skip=skip)
 
92
                skip += max_count
 
93
                ret += [default_mapping.convert_revision_id_git_to_bzr(cm.id) for cm in cms]
 
94
        return [None] + ret
177
95
 
178
96
    def get_signature_text(self, revision_id):
179
97
        raise errors.NoSuchRevision(self, revision_id)
180
98
 
181
 
    def lookup_revision_id(self, revid):
182
 
        """Lookup a revision id.
183
 
        
184
 
        :param revid: Bazaar revision id.
185
 
        :return: Tuple with git revisionid and mapping.
186
 
        """
187
 
        # Yes, this doesn't really work, but good enough as a stub
188
 
        return osutils.sha(rev_id).hexdigest(), self.get_mapping()
189
 
 
190
99
    def has_signature_for_revision_id(self, revision_id):
191
100
        return False
192
101
 
193
 
    def lookup_git_revid(self, bzr_revid):
194
 
        try:
195
 
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
196
 
        except errors.InvalidRevisionId:
197
 
            raise errors.NoSuchRevision(self, bzr_revid)
 
102
    def get_parent_map(self, revision_ids):
 
103
        ret = {}
 
104
        for revid in revision_ids:
 
105
            if revid == revision.NULL_REVISION:
 
106
                ret[revid] = ()
 
107
            else:
 
108
                commit = self._git.commit(default_mapping.convert_revision_id_bzr_to_git(revid))
 
109
                ret[revid] = tuple([default_mapping.convert_revision_id_git_to_bzr(p.id) for p in commit.parents])
 
110
        return ret
198
111
 
199
112
    def get_revision(self, revision_id):
200
 
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
201
 
        try:
202
 
            commit = self._git.commit(git_commit_id)
203
 
        except KeyError:
204
 
            raise errors.NoSuchRevision(self, revision_id)
 
113
        git_commit_id = default_mapping.convert_revision_id_bzr_to_git(revision_id)
 
114
        commit = self._git.commit(git_commit_id)
205
115
        # print "fetched revision:", git_commit_id
206
 
        revision = mapping.import_commit(commit)
207
 
        assert revision is not None
 
116
        revision = self._parse_rev(commit)
208
117
        return revision
209
118
 
210
119
    def has_revision(self, revision_id):
211
120
        try:
212
121
            self.get_revision(revision_id)
213
 
        except errors.NoSuchRevision:
 
122
        except NoSuchRevision:
214
123
            return False
215
124
        else:
216
125
            return True
217
126
 
218
 
    def get_revisions(self, revids):
219
 
        return [self.get_revision(r) for r in revids]
 
127
    def get_revisions(self, revisions):
 
128
        return [self.get_revision(r) for r in revisions]
 
129
 
 
130
    @classmethod
 
131
    def _parse_rev(klass, commit):
 
132
        """Convert a git commit to a bzr revision.
 
133
 
 
134
        :return: a `bzrlib.revision.Revision` object.
 
135
        """
 
136
        rev = revision.Revision(default_mapping.convert_revision_id_git_to_bzr(commit.id))
 
137
        rev.parent_ids = tuple([default_mapping.convert_revision_id_git_to_bzr(p.id) for p in commit.parents])
 
138
        rev.inventory_sha1 = ""
 
139
        rev.message = commit.message.decode("utf-8", "replace")
 
140
        rev.committer = str(commit.committer)
 
141
        rev.properties['author'] = str(commit.author)
 
142
        rev.timestamp = time.mktime(commit.committed_date)
 
143
        rev.timezone = 0
 
144
        return rev
220
145
 
221
146
    def revision_trees(self, revids):
222
147
        for revid in revids:
236
161
        assert revision_id != None
237
162
        return self.revision_tree(revision_id).inventory
238
163
 
239
 
    def set_make_working_trees(self, trees):
240
 
        pass
241
 
 
242
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
243
 
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
 
164
 
 
165
def escape_file_id(file_id):
 
166
    return file_id.replace('_', '__').replace(' ', '_s')
 
167
 
 
168
 
 
169
def unescape_file_id(file_id):
 
170
    return file_id.replace("_s", " ").replace("__", "_")
244
171
 
245
172
 
246
173
class GitRevisionTree(revisiontree.RevisionTree):
248
175
    def __init__(self, repository, revision_id):
249
176
        self._repository = repository
250
177
        self.revision_id = revision_id
251
 
        assert isinstance(revision_id, str)
252
 
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
253
 
        try:
254
 
            commit = repository._git.commit(git_id)
255
 
        except KeyError, r:
256
 
            raise errors.NoSuchRevision(repository, revision_id)
257
 
        self.tree = commit.tree
 
178
        git_id = default_mapping.convert_revision_id_bzr_to_git(revision_id)
 
179
        self.tree = repository._git.commit(git_id).tree
258
180
        self._inventory = inventory.Inventory(revision_id=revision_id)
259
181
        self._inventory.root.revision = revision_id
260
182
        self._build_inventory(self.tree, self._inventory.root, "")
265
187
    def get_file_text(self, file_id):
266
188
        entry = self._inventory[file_id]
267
189
        if entry.kind == 'directory': return ""
268
 
        return self._repository._git.get_blob(entry.text_id).data
 
190
        return self._repository._git.blob(entry.text_id).data
269
191
 
270
 
    def _build_inventory(self, tree_id, ie, path):
 
192
    def _build_inventory(self, tree, ie, path):
271
193
        assert isinstance(path, str)
272
 
        tree = self._repository._git.tree(tree_id)
273
 
        for mode, name, hexsha in tree.entries():
274
 
            basename = name.decode("utf-8")
 
194
        for b in tree.contents:
 
195
            basename = b.name.decode("utf-8")
275
196
            if path == "":
276
 
                child_path = name
 
197
                child_path = b.name
277
198
            else:
278
 
                child_path = urlutils.join(path, name)
279
 
            file_id = self.mapping.generate_file_id(child_path)
280
 
            entry_kind = (mode & 0700000) / 0100000
281
 
            if entry_kind == 0:
 
199
                child_path = urlutils.join(path, b.name)
 
200
            file_id = escape_file_id(child_path.encode('utf-8'))
 
201
            if b.mode[0] == '0':
282
202
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
283
 
            elif entry_kind == 1:
284
 
                file_kind = (mode & 070000) / 010000
285
 
                b = self._repository._git.get_blob(hexsha)
286
 
                if file_kind == 0:
 
203
            elif b.mode[0] == '1':
 
204
                if b.mode[1] == '0':
287
205
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
288
206
                    child_ie.text_sha1 = osutils.sha_string(b.data)
289
 
                elif file_kind == 2:
 
207
                elif b.mode[1] == '2':
290
208
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
291
209
                    child_ie.text_sha1 = osutils.sha_string("")
292
210
                else:
293
211
                    raise AssertionError(
294
 
                        "Unknown file kind, perms=%o." % (mode,))
 
212
                        "Unknown file kind, perms=%r." % (b.mode,))
295
213
                child_ie.text_id = b.id
296
 
                child_ie.text_size = len(b.data)
 
214
                child_ie.text_size = b.size
297
215
            else:
298
216
                raise AssertionError(
299
 
                    "Unknown blob kind, perms=%r." % (mode,))
300
 
            fs_mode = mode & 0777
301
 
            child_ie.executable = bool(fs_mode & 0111)
 
217
                    "Unknown blob kind, perms=%r." % (b.mode,))
 
218
            child_ie.executable = bool(int(b.mode[3:], 8) & 0111)
302
219
            child_ie.revision = self.revision_id
303
220
            self._inventory.add(child_ie)
304
 
            if entry_kind == 0:
305
 
                self._build_inventory(hexsha, child_ie, child_path)
 
221
            if b.mode[0] == '0':
 
222
                self._build_inventory(b, child_ie, child_path)
306
223
 
307
224
 
308
225
class GitFormat(object):
309
226
 
310
227
    supports_tree_reference = False
311
 
    rich_root_data = True
312
228
 
313
229
    def get_format_description(self):
314
230
        return "Git Repository"
315
 
 
316
 
    def initialize(self, url, shared=False, _internal=False):
317
 
        raise bzr_errors.UninitializableFormat(self)
318
 
 
319
 
    def check_conversion_target(self, target_repo_format):
320
 
        return target_repo_format.rich_root_data