~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/knitrepo.py

remove all trailing whitespace from bzr source

Show diffs side-by-side

added added

removed removed

Lines of Context:
222
222
        reconciler = KnitReconciler(self, thorough=thorough)
223
223
        reconciler.reconcile()
224
224
        return reconciler
225
 
    
 
225
 
226
226
    def _make_parents_provider(self):
227
227
        return _KnitsParentsProvider(self.revisions)
228
228
 
259
259
 
260
260
 
261
261
class RepositoryFormatKnit(MetaDirRepositoryFormat):
262
 
    """Bzr repository knit format (generalized). 
 
262
    """Bzr repository knit format (generalized).
263
263
 
264
264
    This repository format has:
265
265
     - knits for file texts and inventory
333
333
        dirs = ['knits']
334
334
        files = []
335
335
        utf8_files = [('format', self.get_format_string())]
336
 
        
 
336
 
337
337
        self._upload_blank_content(a_bzrdir, dirs, files, utf8_files, shared)
338
338
        repo_transport = a_bzrdir.get_repository_transport(None)
339
339
        control_files = lockable_files.LockableFiles(repo_transport,
351
351
 
352
352
    def open(self, a_bzrdir, _found=False, _override_transport=None):
353
353
        """See RepositoryFormat.open().
354
 
        
 
354
 
355
355
        :param _override_transport: INTERNAL USE ONLY. Allows opening the
356
356
                                    repository at a slightly different url
357
357
                                    than normal. I.e. during 'upgrade'.
453
453
        if not getattr(target_format, 'supports_tree_reference', False):
454
454
            raise errors.BadConversionTarget(
455
455
                'Does not support nested trees', target_format)
456
 
            
 
456
 
457
457
    def get_format_string(self):
458
458
        """See RepositoryFormat.get_format_string()."""
459
459
        return "Bazaar Knit Repository Format 3 (bzr 0.15)\n"