/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

Formatting fixes, specify path to a couple more functions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
109
109
    chk_bytes = None
110
110
 
111
111
    def __init__(self, gitdir, lockfiles):
112
 
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir, lockfiles)
 
112
        super(GitRepository, self).__init__(GitRepositoryFormat(),
 
113
            gitdir, lockfiles)
113
114
        from bzrlib.plugins.git import fetch, push
114
115
        for optimiser in [fetch.InterRemoteGitNonGitRepository,
115
116
                          fetch.InterLocalGitNonGitRepository,
119
120
            repository.InterRepository.register_optimiser(optimiser)
120
121
 
121
122
    def add_fallback_repository(self, basis_url):
122
 
        raise errors.UnstackableRepositoryFormat(self._format, self.control_transport.base)
 
123
        raise errors.UnstackableRepositoryFormat(self._format,
 
124
            self.control_transport.base)
123
125
 
124
126
    def is_shared(self):
125
127
        return False
185
187
            lossy)
186
188
 
187
189
    def get_file_graph(self):
188
 
        return _mod_graph.Graph(GitFileParentProvider(self._file_change_scanner))
 
190
        return _mod_graph.Graph(GitFileParentProvider(
 
191
            self._file_change_scanner))
189
192
 
190
193
    def iter_files_bytes(self, desired_files):
191
194
        """Iterate through file versions.
208
211
        """
209
212
        per_revision = {}
210
213
        for (file_id, revision_id, identifier) in desired_files:
211
 
            per_revision.setdefault(revision_id, []).append((file_id, identifier))
 
214
            per_revision.setdefault(revision_id, []).append(
 
215
                (file_id, identifier))
212
216
        for revid, files in per_revision.iteritems():
213
217
            (commit_id, mapping) = self.lookup_bzr_revision_id(revid)
214
218
            try:
327
331
            if mapping is None:
328
332
                mapping = self.get_mapping()
329
333
            try:
330
 
                return (self._git.refs[mapping.revid_as_refname(bzr_revid)], mapping)
 
334
                return (self._git.refs[mapping.revid_as_refname(bzr_revid)],
 
335
                        mapping)
331
336
            except KeyError:
332
337
                # Update refs from Git commit objects
333
338
                # FIXME: Hitting this a lot will be very inefficient...