/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

Improve formatting.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
68
68
    def __init__(self, gitdir, lockfiles):
69
69
        ForeignRepository.__init__(self, GitFormat(), gitdir, lockfiles)
70
70
        from bzrlib.plugins.git import fetch
71
 
        repository.InterRepository.register_optimiser(fetch.InterGitRepository)
72
 
        repository.InterRepository.register_optimiser(fetch.InterGitNonGitRepository)
 
71
        for optimiser in [fetch.InterGitRepository, 
 
72
                          fetch.InterGitNonGitRepository]:
 
73
            repository.InterRepository.register_optimiser(optimiser)
73
74
 
74
75
    def is_shared(self):
75
76
        return True
89
90
 
90
91
 
91
92
class LocalGitRepository(GitRepository):
 
93
    """Git repository on the file system."""
92
94
 
93
95
    def __init__(self, gitdir, lockfiles):
94
96
        # FIXME: This also caches negatives. Need to be more careful 
187
189
            try:
188
190
                for i, revid in enumerate(todo):
189
191
                    pb.update("pushing revisions", i, len(todo))
190
 
                    git_commit = self.import_revision_gist(source, revid, gitidmap.__getitem__)
 
192
                    git_commit = self.import_revision_gist(source, revid,
 
193
                        gitidmap.__getitem__)
191
194
                    gitidmap[revid] = git_commit
192
 
                    git_revid = self.get_mapping().revision_id_foreign_to_bzr(git_commit)
 
195
                    git_revid = self.get_mapping().revision_id_foreign_to_bzr(
 
196
                        git_commit)
193
197
                    revidmap[revid] = git_revid
194
198
            finally:
195
199
                pb.finished()
247
251
 
248
252
    def revision_tree(self, revision_id):
249
253
        revision_id = revision.ensure_null(revision_id)
250
 
 
251
254
        if revision_id == revision.NULL_REVISION:
252
255
            inv = inventory.Inventory(root_id=None)
253
256
            inv.revision_id = revision_id
254
257
            return revisiontree.RevisionTree(self, inv, revision_id)
255
 
 
256
258
        return GitRevisionTree(self, revision_id)
257
259
 
258
260
    def get_inventory(self, revision_id):
262
264
    def set_make_working_trees(self, trees):
263
265
        pass
264
266
 
265
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
 
267
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
 
268
        progress=None):
266
269
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
267
270
 
268
271