← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/knitrepo.py

  • Committer: Robert Collins
  • Date: 2007-08-05 09:59:13 UTC
  • mto: (2592.5.3 pack-repository)
  • mto: This revision was merged to the branch mainline in revision 2933.
  • Revision ID: robertc@robertcollins.net-20070805095913-oir8h97dm86v5ol7
Make reconcile work, and pass tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/knitrepo.py
810
810
    def get_inventory_weave(self):
811
811
        return self._inv_thunk.get_weave()
812
812
 
 
813
    @needs_write_lock
 
814
    def reconcile(self, other=None, thorough=False):
 
815
        """Reconcile this repository."""
 
816
        from bzrlib.reconcile import PackReconciler
 
817
        reconciler = PackReconciler(self, thorough=thorough)
 
818
        reconciler.reconcile()
 
819
        return reconciler
 
820
 
 
821
    def reconcile_actions(self):
 
822
        """Return a set of actions taken by reconcile on this repository.
 
823
 
 
824
        Pack repositories currently perform no reconciliation.
 
825
 
 
826
        :return: A set of actions. e.g. set(['inventory_gc']).
 
827
        """
 
828
        return set([])
 
829
 
813
830
 
814
831
class GraphKnitRepository3(KnitRepository3):
815
832
    """Experimental graph-knit using subtrees repository."""
883
900
    def get_inventory_weave(self):
884
901
        return self._inv_thunk.get_weave()
885
902
 
 
903
    @needs_write_lock
 
904
    def reconcile(self, other=None, thorough=False):
 
905
        """Reconcile this repository."""
 
906
        from bzrlib.reconcile import PackReconciler
 
907
        reconciler = PackReconciler(self, thorough=thorough)
 
908
        reconciler.reconcile()
 
909
        return reconciler
 
910
 
 
911
    def reconcile_actions(self):
 
912
        """Return a set of actions taken by reconcile on this repository.
 
913
        
 
914
        :return: A set of actions. e.g. set(['inventory_gc']).
 
915
        """
 
916
        return set([])
 
917
 
886
918
 
887
919
class RepositoryFormatKnit(MetaDirRepositoryFormat):
888
920
    """Bzr repository knit format (generalized).