/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 in dulwich.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
1
1
# Copyright (C) 2007 Canonical Ltd
2
 
# Copyright (C) 2008-2009 Jelmer Vernooij <jelmer@samba.org>
3
2
#
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
17
16
 
18
17
"""An adapter between a Git Repository and a Bazaar Branch"""
19
18
 
 
19
import git
 
20
import os
 
21
import time
 
22
 
20
23
import bzrlib
21
24
from bzrlib import (
 
25
    deprecated_graph,
22
26
    errors,
23
 
    graph,
24
27
    inventory,
25
28
    osutils,
26
29
    repository,
27
30
    revision,
28
31
    revisiontree,
29
 
    ui,
30
32
    urlutils,
 
33
    versionedfile,
31
34
    )
32
35
from bzrlib.foreign import (
 
36
        ForeignRevision,
 
37
        )
 
38
from bzrlib.transport import get_transport
 
39
 
 
40
from bzrlib.plugins.git.foreign import (
33
41
    ForeignRepository,
34
 
    )
35
 
from bzrlib.trace import (
36
 
    mutter,
37
 
    )
38
 
from bzrlib.transport import (
39
 
    get_transport,
40
 
    )
41
 
 
42
 
from bzrlib.plugins.git.commit import (
43
 
    GitCommitBuilder,
44
 
    )
45
 
from bzrlib.plugins.git.inventory import (
46
 
    GitInventory,
47
 
    )
48
 
from bzrlib.plugins.git.mapping import (
49
 
    default_mapping,
50
 
    foreign_git,
51
 
    mapping_registry,
52
 
    )
53
 
from bzrlib.plugins.git.versionedfiles import (
54
 
    GitRevisions,
55
 
    GitTexts,
56
 
    )
 
42
    versionedfiles,
 
43
    )
 
44
from bzrlib.plugins.git.mapping import default_mapping
57
45
 
58
46
 
59
47
class GitRepository(ForeignRepository):
60
48
    """An adapter to git repositories for bzr."""
61
49
 
62
50
    _serializer = None
63
 
    _commit_builder_class = GitCommitBuilder
64
 
    vcs = foreign_git
65
 
 
66
 
    def __init__(self, gitdir, lockfiles):
67
 
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir, 
68
 
            lockfiles)
69
 
        from bzrlib.plugins.git import fetch, push
70
 
        for optimiser in [fetch.InterRemoteGitNonGitRepository, 
71
 
                          fetch.InterLocalGitNonGitRepository,
72
 
                          fetch.InterGitGitRepository,
73
 
                          push.InterToLocalGitRepository,
74
 
                          push.InterToRemoteGitRepository]:
75
 
            repository.InterRepository.register_optimiser(optimiser)
76
 
 
77
 
    def is_shared(self):
78
 
        return True
79
 
 
80
 
    def supports_rich_root(self):
81
 
        return True
82
 
 
83
 
    def _warn_if_deprecated(self):
84
 
        # This class isn't deprecated
85
 
        pass
86
 
 
87
 
    def get_mapping(self):
88
 
        return default_mapping
89
 
 
90
 
    def make_working_trees(self):
91
 
        return True
92
 
 
93
 
    def dfetch(self, source, stop_revision):
94
 
        interrepo = repository.InterRepository.get(source, self)
95
 
        return interrepo.dfetch(stop_revision)
96
 
 
97
 
    def dfetch_refs(self, source, stop_revision):
98
 
        interrepo = repository.InterRepository.get(source, self)
99
 
        return interrepo.dfetch_refs(stop_revision)
100
 
 
101
 
 
102
 
class LocalGitRepository(GitRepository):
103
 
    """Git repository on the file system."""
104
 
 
105
 
    def __init__(self, gitdir, lockfiles):
106
 
        # FIXME: This also caches negatives. Need to be more careful 
107
 
        # about this once we start writing to git
108
 
        self._parents_provider = graph.CachingParentsProvider(self)
109
 
        GitRepository.__init__(self, gitdir, lockfiles)
 
51
 
 
52
    def __init__(self, gitdir, lockfiles):
110
53
        self.base = gitdir.root_transport.base
 
54
        self.bzrdir = gitdir
 
55
        self.control_files = lockfiles
111
56
        self._git = gitdir._git
112
57
        self.texts = None
113
 
        self.signatures = None
114
 
        self.revisions = GitRevisions(self._git.object_store)
115
 
        self.inventories = None
116
 
        self.texts = GitTexts(self)
 
58
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
 
59
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
 
60
        self._format = GitFormat()
 
61
        self._fallback_repositories = []
117
62
 
118
 
    def all_revision_ids(self):
119
 
        ret = set([revision.NULL_REVISION])
120
 
        heads = self._git.refs.as_dict('refs/heads')
121
 
        if heads == {}:
122
 
            return ret
123
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
124
 
        ret = set(bzr_heads)
125
 
        graph = self.get_graph()
126
 
        for rev, parents in graph.iter_ancestry(bzr_heads):
127
 
            ret.add(rev)
 
63
    def _all_revision_ids(self):
 
64
        if self._git.heads == []:
 
65
            return set()
 
66
        ret = set()
 
67
        skip = 0
 
68
        max_count = 1000
 
69
        cms = None
 
70
        while cms != []:
 
71
            cms = self._git.commits("--all", max_count=max_count, skip=skip)
 
72
            skip += max_count
 
73
            ret.update([default_mapping.revision_id_foreign_to_bzr(cm.id) for cm in cms])
128
74
        return ret
129
75
 
130
 
    def _make_parents_provider(self):
131
 
        """See Repository._make_parents_provider()."""
132
 
        return self._parents_provider
133
 
 
134
 
    def get_parent_map(self, revids):
135
 
        parent_map = {}
136
 
        for revision_id in revids:
137
 
            assert isinstance(revision_id, str)
138
 
            if revision_id == revision.NULL_REVISION:
139
 
                parent_map[revision_id] = ()
140
 
                continue
141
 
            hexsha, mapping = self.lookup_git_revid(revision_id)
142
 
            commit  = self._git.commit(hexsha)
143
 
            if commit is None:
144
 
                continue
145
 
            else:
146
 
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
147
 
        return parent_map
148
 
 
149
 
    def get_ancestry(self, revision_id, topo_sorted=True):
150
 
        """See Repository.get_ancestry().
151
 
        """
152
 
        if revision_id is None:
153
 
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
154
 
        assert isinstance(revision_id, str)
155
 
        ancestry = []
156
 
        graph = self.get_graph()
157
 
        for rev, parents in graph.iter_ancestry([revision_id]):
158
 
            ancestry.append(rev)
159
 
        ancestry.reverse()
160
 
        return [None] + ancestry
 
76
    def is_shared(self):
 
77
        return True
 
78
 
 
79
    def supports_rich_root(self):
 
80
        return False
 
81
 
 
82
    #def get_revision_delta(self, revision_id):
 
83
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
 
84
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
 
85
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
 
86
 
 
87
    def get_ancestry(self, revision_id):
 
88
        revision_id = revision.ensure_null(revision_id)
 
89
        ret = []
 
90
        if revision_id != revision.NULL_REVISION:
 
91
            skip = 0
 
92
            max_count = 1000
 
93
            cms = None
 
94
            while cms != []:
 
95
                cms = self._git.commits(self.lookup_git_revid(revision_id, default_mapping), max_count=max_count, skip=skip)
 
96
                skip += max_count
 
97
                ret += [default_mapping.revision_id_foreign_to_bzr(cm.id) for cm in cms]
 
98
        return [None] + ret
161
99
 
162
100
    def get_signature_text(self, revision_id):
163
101
        raise errors.NoSuchRevision(self, revision_id)
164
102
 
165
 
    def lookup_revision_id(self, revid):
166
 
        """Lookup a revision id.
167
 
        
168
 
        :param revid: Bazaar revision id.
169
 
        :return: Tuple with git revisionid and mapping.
170
 
        """
171
 
        # Yes, this doesn't really work, but good enough as a stub
172
 
        return osutils.sha(rev_id).hexdigest(), self.get_mapping()
173
 
 
174
103
    def has_signature_for_revision_id(self, revision_id):
175
104
        return False
176
105
 
177
 
    def lookup_git_revid(self, bzr_revid):
 
106
    def get_parent_map(self, revision_ids):
 
107
        ret = {}
 
108
        for revid in revision_ids:
 
109
            if revid == revision.NULL_REVISION:
 
110
                ret[revid] = ()
 
111
            else:
 
112
                commit = self._git.commit(self.lookup_git_revid(revid, default_mapping))
 
113
                ret[revid] = tuple([default_mapping.revision_id_foreign_to_bzr(p.id) for p in commit.parents])
 
114
        return ret
 
115
 
 
116
    def lookup_git_revid(self, bzr_revid, mapping):
178
117
        try:
179
 
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
 
118
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
180
119
        except errors.InvalidRevisionId:
181
 
            raise errors.NoSuchRevision(self, bzr_revid)
 
120
            raise errors.NoSuchRevision(bzr_revid, self)
182
121
 
183
122
    def get_revision(self, revision_id):
184
 
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
185
 
        try:
186
 
            commit = self._git.commit(git_commit_id)
187
 
        except KeyError:
188
 
            raise errors.NoSuchRevision(self, revision_id)
 
123
        git_commit_id = self.lookup_git_revid(revision_id, default_mapping)
 
124
        commit = self._git.commit(git_commit_id)
189
125
        # print "fetched revision:", git_commit_id
190
 
        revision = mapping.import_commit(commit)
191
 
        assert revision is not None
 
126
        revision = self._parse_rev(commit, default_mapping)
192
127
        return revision
193
128
 
194
129
    def has_revision(self, revision_id):
195
130
        try:
196
131
            self.get_revision(revision_id)
197
 
        except errors.NoSuchRevision:
 
132
        except NoSuchRevision:
198
133
            return False
199
134
        else:
200
135
            return True
201
136
 
202
 
    def get_revisions(self, revids):
203
 
        return [self.get_revision(r) for r in revids]
 
137
    def get_revisions(self, revisions):
 
138
        return [self.get_revision(r) for r in revisions]
 
139
 
 
140
    @classmethod
 
141
    def _parse_rev(klass, commit, mapping):
 
142
        """Convert a git commit to a bzr revision.
 
143
 
 
144
        :return: a `bzrlib.revision.Revision` object.
 
145
        """
 
146
        rev = ForeignRevision(commit.id, mapping, mapping.revision_id_foreign_to_bzr(commit.id))
 
147
        rev.parent_ids = tuple([mapping.revision_id_foreign_to_bzr(p.id) for p in commit.parents])
 
148
        rev.message = commit.message.decode("utf-8", "replace")
 
149
        rev.committer = str(commit.committer).decode("utf-8", "replace")
 
150
        rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
 
151
        rev.timestamp = time.mktime(commit.committed_date)
 
152
        rev.timezone = 0
 
153
        return rev
204
154
 
205
155
    def revision_trees(self, revids):
206
156
        for revid in revids:
208
158
 
209
159
    def revision_tree(self, revision_id):
210
160
        revision_id = revision.ensure_null(revision_id)
 
161
 
211
162
        if revision_id == revision.NULL_REVISION:
212
163
            inv = inventory.Inventory(root_id=None)
213
164
            inv.revision_id = revision_id
214
165
            return revisiontree.RevisionTree(self, inv, revision_id)
 
166
 
215
167
        return GitRevisionTree(self, revision_id)
216
168
 
217
169
    def get_inventory(self, revision_id):
221
173
    def set_make_working_trees(self, trees):
222
174
        pass
223
175
 
224
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
225
 
        progress=None):
226
 
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
 
176
 
 
177
def escape_file_id(file_id):
 
178
    return file_id.replace('_', '__').replace(' ', '_s')
 
179
 
 
180
 
 
181
def unescape_file_id(file_id):
 
182
    return file_id.replace("_s", " ").replace("__", "_")
227
183
 
228
184
 
229
185
class GitRevisionTree(revisiontree.RevisionTree):
230
186
 
231
187
    def __init__(self, repository, revision_id):
232
 
        self._revision_id = revision_id
233
188
        self._repository = repository
234
 
        store = repository._git.object_store
235
 
        assert isinstance(revision_id, str)
236
 
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
237
 
        try:
238
 
            commit = store[git_id]
239
 
        except KeyError, r:
240
 
            raise errors.NoSuchRevision(repository, revision_id)
241
 
        self.tree = commit.tree
242
 
        self._inventory = GitInventory(self.tree, self.mapping, store, 
243
 
                                       revision_id)
 
189
        self.revision_id = revision_id
 
190
        git_id = repository.lookup_git_revid(revision_id, default_mapping)
 
191
        self.tree = repository._git.commit(git_id).tree
 
192
        self._inventory = inventory.Inventory(revision_id=revision_id)
 
193
        self._inventory.root.revision = revision_id
 
194
        self._build_inventory(self.tree, self._inventory.root, "")
244
195
 
245
196
    def get_revision_id(self):
246
 
        return self._revision_id
 
197
        return self.revision_id
247
198
 
248
 
    def get_file_text(self, file_id, path=None):
249
 
        if path is not None:
250
 
            entry = self._inventory._get_ie(path)
251
 
        else:
252
 
            entry = self._inventory[file_id]
 
199
    def get_file_text(self, file_id):
 
200
        entry = self._inventory[file_id]
253
201
        if entry.kind == 'directory': return ""
254
 
        return entry.object.data
255
 
 
256
 
 
257
 
class GitRepositoryFormat(repository.RepositoryFormat):
258
 
    """Git repository format."""
 
202
        return self._repository._git.blob(entry.text_id).data
 
203
 
 
204
    def _build_inventory(self, tree, ie, path):
 
205
        assert isinstance(path, str)
 
206
        for b in tree.contents:
 
207
            basename = b.name.decode("utf-8")
 
208
            if path == "":
 
209
                child_path = b.name
 
210
            else:
 
211
                child_path = urlutils.join(path, b.name)
 
212
            file_id = escape_file_id(child_path.encode('utf-8'))
 
213
            if b.mode[0] == '0':
 
214
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
 
215
            elif b.mode[0] == '1':
 
216
                if b.mode[1] == '0':
 
217
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
 
218
                    child_ie.text_sha1 = osutils.sha_string(b.data)
 
219
                elif b.mode[1] == '2':
 
220
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
 
221
                    child_ie.text_sha1 = osutils.sha_string("")
 
222
                else:
 
223
                    raise AssertionError(
 
224
                        "Unknown file kind, perms=%r." % (b.mode,))
 
225
                child_ie.text_id = b.id
 
226
                child_ie.text_size = b.size
 
227
            else:
 
228
                raise AssertionError(
 
229
                    "Unknown blob kind, perms=%r." % (b.mode,))
 
230
            child_ie.executable = bool(int(b.mode[3:], 8) & 0111)
 
231
            child_ie.revision = self.revision_id
 
232
            self._inventory.add(child_ie)
 
233
            if b.mode[0] == '0':
 
234
                self._build_inventory(b, child_ie, child_path)
 
235
 
 
236
 
 
237
class GitFormat(object):
259
238
 
260
239
    supports_tree_reference = False
261
 
    rich_root_data = True
262
240
 
263
241
    def get_format_description(self):
264
242
        return "Git Repository"
265
 
 
266
 
    def initialize(self, url, shared=False, _internal=False):
267
 
        raise bzr_errors.UninitializableFormat(self)
268
 
 
269
 
    def check_conversion_target(self, target_repo_format):
270
 
        return target_repo_format.rich_root_data