/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 bzrlib/repository.py

Multiple merges:
 * push should work with branches without a working tree.
 * Knit pushes on SFTP are now much faster (removed a bad latency multiplier).
 * Reconciles at the end of fetch now skip non-dataloss issues. The command line
   reconcile will still check all data.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
489
489
        raise NotImplementedError(self.is_shared)
490
490
 
491
491
    @needs_write_lock
492
 
    def reconcile(self):
 
492
    def reconcile(self, other=None, thorough=False):
493
493
        """Reconcile this repository."""
494
494
        from bzrlib.reconcile import RepoReconciler
495
 
        reconciler = RepoReconciler(self)
 
495
        reconciler = RepoReconciler(self, thorough=thorough)
496
496
        reconciler.reconcile()
497
497
        return reconciler
498
498
    
806
806
        return vf
807
807
 
808
808
    @needs_write_lock
809
 
    def reconcile(self):
 
809
    def reconcile(self, other=None, thorough=False):
810
810
        """Reconcile this repository."""
811
811
        from bzrlib.reconcile import KnitReconciler
812
 
        reconciler = KnitReconciler(self)
 
812
        reconciler = KnitReconciler(self, thorough=thorough)
813
813
        reconciler.reconcile()
814
814
        return reconciler
815
815