/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

  • Committer: Jelmer Vernooij
  • Date: 2008-12-25 01:28:00 UTC
  • mto: (0.200.144 dulwich)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20081225012800-96iswmhsbn3wlyz6
Update copyright years.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
33
33
    versionedfile,
34
34
    )
35
35
from bzrlib.foreign import (
36
 
        ForeignRepository,
 
36
        ForeignRevision,
37
37
        )
38
38
from bzrlib.trace import mutter
39
39
from bzrlib.transport import get_transport
40
40
 
41
41
from bzrlib.plugins.git.foreign import (
 
42
    ForeignRepository,
42
43
    versionedfiles,
43
44
    )
44
45
from bzrlib.plugins.git.mapping import default_mapping
61
62
    _serializer = None
62
63
 
63
64
    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
 
 
68
 
    def is_shared(self):
69
 
        return True
70
 
 
71
 
    def supports_rich_root(self):
72
 
        return True
73
 
 
74
 
    def _warn_if_deprecated(self):
75
 
        # This class isn't deprecated
76
 
        pass
77
 
 
78
 
    def get_mapping(self):
79
 
        return default_mapping
80
 
 
81
 
    def make_working_trees(self):
82
 
        return True
83
 
 
84
 
 
85
 
class LocalGitRepository(GitRepository):
86
 
 
87
 
    def __init__(self, gitdir, lockfiles):
88
65
        # FIXME: This also caches negatives. Need to be more careful 
89
66
        # about this once we start writing to git
90
67
        self._parents_provider = graph.CachingParentsProvider(self)
91
 
        GitRepository.__init__(self, gitdir, lockfiles)
 
68
        ForeignRepository.__init__(self, GitFormat(), gitdir, lockfiles)
92
69
        self.base = gitdir.root_transport.base
 
70
        self.bzrdir = gitdir
93
71
        self._git = gitdir._git
94
72
        self.texts = None
95
73
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
96
74
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
97
75
        self.tags = GitTags(self._git.get_tags())
 
76
        from bzrlib.plugins.git import fetch
 
77
        repository.InterRepository.register_optimiser(fetch.InterFromGitRepository)
98
78
 
99
79
    def all_revision_ids(self):
100
80
        ret = set([revision.NULL_REVISION])
107
87
            ret.add(rev)
108
88
        return ret
109
89
 
 
90
    def is_shared(self):
 
91
        return True
 
92
 
 
93
    def supports_rich_root(self):
 
94
        return True
 
95
 
110
96
    #def get_revision_delta(self, revision_id):
111
97
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
112
98
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
147
133
        ancestry.reverse()
148
134
        return ancestry
149
135
 
 
136
    def _warn_if_deprecated(self):
 
137
        # This class isn't deprecated
 
138
        pass
 
139
 
150
140
    def get_signature_text(self, revision_id):
151
141
        raise errors.NoSuchRevision(self, revision_id)
152
142
 
162
152
    def has_signature_for_revision_id(self, revision_id):
163
153
        return False
164
154
 
 
155
    def get_mapping(self):
 
156
        return default_mapping
 
157
 
165
158
    def lookup_git_revid(self, bzr_revid, mapping):
166
159
        try:
167
160
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
170
163
 
171
164
    def get_revision(self, revision_id):
172
165
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
173
 
        try:
174
 
            commit = self._git.commit(git_commit_id)
175
 
        except KeyError:
 
166
        commit = self._git.commit(git_commit_id)
 
167
        # print "fetched revision:", git_commit_id
 
168
        if commit is None:
176
169
            raise errors.NoSuchRevision(self, revision_id)
177
 
        # print "fetched revision:", git_commit_id
178
 
        revision = self.get_mapping().import_commit(commit)
 
170
        revision = self._parse_rev(commit, self.get_mapping())
179
171
        assert revision is not None
180
172
        return revision
181
173
 
190
182
    def get_revisions(self, revids):
191
183
        return [self.get_revision(r) for r in revids]
192
184
 
 
185
    @classmethod
 
186
    def _parse_rev(klass, commit, mapping):
 
187
        """Convert a git commit to a bzr revision.
 
188
 
 
189
        :return: a `bzrlib.revision.Revision` object.
 
190
        """
 
191
        if commit is None:
 
192
            raise AssertionError("Commit object can't be None")
 
193
        rev = ForeignRevision(commit.id, mapping, mapping.revision_id_foreign_to_bzr(commit.id))
 
194
        rev.parent_ids = tuple([mapping.revision_id_foreign_to_bzr(p) for p in commit.parents])
 
195
        rev.message = commit.message.decode("utf-8", "replace")
 
196
        rev.committer = str(commit.committer).decode("utf-8", "replace")
 
197
        if commit.committer != commit.author:
 
198
            rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
 
199
        rev.timestamp = commit.commit_time
 
200
        rev.timezone = 0
 
201
        return rev
 
202
 
193
203
    def revision_trees(self, revids):
194
204
        for revid in revids:
195
205
            yield self.revision_tree(revid)
202
212
            inv.revision_id = revision_id
203
213
            return revisiontree.RevisionTree(self, inv, revision_id)
204
214
 
205
 
        return GitRevisionTree(self, self.get_mapping(), revision_id)
 
215
        return GitRevisionTree(self, revision_id)
206
216
 
207
217
    def get_inventory(self, revision_id):
208
218
        assert revision_id != None
211
221
    def set_make_working_trees(self, trees):
212
222
        pass
213
223
 
214
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
215
 
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
 
224
 
 
225
def escape_file_id(file_id):
 
226
    return file_id.replace('_', '__').replace(' ', '_s')
 
227
 
 
228
 
 
229
def unescape_file_id(file_id):
 
230
    return file_id.replace("_s", " ").replace("__", "_")
216
231
 
217
232
 
218
233
class GitRevisionTree(revisiontree.RevisionTree):
219
234
 
220
 
    def __init__(self, repository, mapping, revision_id):
 
235
    def __init__(self, repository, revision_id):
221
236
        self._repository = repository
222
237
        self.revision_id = revision_id
223
 
        assert isinstance(revision_id, str)
224
 
        self.mapping = mapping
225
 
        git_id = repository.lookup_git_revid(revision_id, self.mapping)
226
 
        try:
227
 
            commit = repository._git.commit(git_id)
228
 
        except KeyError, r:
229
 
            raise errors.NoSuchRevision(repository, revision_id)
230
 
        self.tree = commit.tree
 
238
        git_id = repository.lookup_git_revid(revision_id, repository.get_mapping())
 
239
        self.tree = repository._git.commit(git_id).tree
231
240
        self._inventory = inventory.Inventory(revision_id=revision_id)
232
241
        self._inventory.root.revision = revision_id
233
242
        self._build_inventory(self.tree, self._inventory.root, "")
242
251
 
243
252
    def _build_inventory(self, tree_id, ie, path):
244
253
        assert isinstance(path, str)
245
 
        tree = self._repository._git.tree(tree_id)
 
254
        tree = self._repository._git.get_tree(tree_id)
246
255
        for mode, name, hexsha in tree.entries():
247
256
            basename = name.decode("utf-8")
248
257
            if path == "":
249
258
                child_path = name
250
259
            else:
251
260
                child_path = urlutils.join(path, name)
252
 
            file_id = self.mapping.generate_file_id(child_path)
 
261
            file_id = escape_file_id(child_path.encode('utf-8'))
253
262
            entry_kind = (mode & 0700000) / 0100000
254
263
            if entry_kind == 0:
255
264
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)