Rev 2870: (robertc) Minor tweaks to reconcile from the packs branch. (Robert Collins) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2870
revision-id: pqm at pqm.ubuntu.com-20070927030442-kr30mx8du7pq8o3m
parent: pqm at pqm.ubuntu.com-20070926044943-flj37wmwhmd0l3f1
parent: robertc at robertcollins.net-20070927021812-13m2l8q0m5qbmykj
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-09-27 04:04:42 +0100
message:
  (robertc) Minor tweaks to reconcile from the packs branch. (Robert Collins)
modified:
  bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
  bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
    ------------------------------------------------------------
    revno: 2857.1.2
    merged: robertc at robertcollins.net-20070927021812-13m2l8q0m5qbmykj
    parent: robertc at robertcollins.net-20070925035721-wjyn9fjd4vxy5n7f
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: reconcile
    timestamp: Thu 2007-09-27 12:18:12 +1000
    message:
      Review feedback.
    ------------------------------------------------------------
    revno: 2857.1.1
    merged: robertc at robertcollins.net-20070925035721-wjyn9fjd4vxy5n7f
    parent: pqm at pqm.ubuntu.com-20070925032108-y6nxt0xmghqldn4g
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: reconcile
    timestamp: Tue 2007-09-25 13:57:21 +1000
    message:
      (robertc) Reconcile tweaks from the packs branch. (Robert Collins)
=== modified file 'bzrlib/reconcile.py'
--- a/bzrlib/reconcile.py	2007-09-12 04:21:51 +0000
+++ b/bzrlib/reconcile.py	2007-09-27 02:18:12 +0000
@@ -17,7 +17,12 @@
 """Reconcilers are able to fix some potential data errors in a branch."""
 
 
-__all__ = ['reconcile', 'Reconciler', 'RepoReconciler', 'KnitReconciler']
+__all__ = [
+    'KnitReconciler',
+    'reconcile',
+    'Reconciler',
+    'RepoReconciler',
+    ]
 
 
 from bzrlib import ui
@@ -77,6 +82,11 @@
 class RepoReconciler(object):
     """Reconciler that reconciles a repository.
 
+    The goal of repository reconciliation is to make any derived data
+    consistent with the core data committed by a user. This can involve 
+    reindexing, or removing unreferenced data if that can interfere with
+    queries in a given repository.
+
     Currently this consists of an inventory reweave with revision cross-checks.
     """
 
@@ -267,9 +277,7 @@
 class KnitReconciler(RepoReconciler):
     """Reconciler that reconciles a knit format repository.
 
-    This will detect garbage inventories and remove them.
-
-    Inconsistent parentage is checked for in the revision weave.
+    This will detect garbage inventories and remove them in thorough mode.
     """
 
     def _reconcile_steps(self):

=== modified file 'bzrlib/tests/blackbox/test_reconcile.py'
--- a/bzrlib/tests/blackbox/test_reconcile.py	2007-06-27 19:13:50 +0000
+++ b/bzrlib/tests/blackbox/test_reconcile.py	2007-09-25 03:57:21 +0000
@@ -54,7 +54,11 @@
         repo = t.branch.repository
         inv = Inventory(revision_id='missing')
         inv.root.revision='missing'
+        repo.lock_write()
+        repo.start_write_group()
         repo.add_inventory('missing', inv, [])
+        repo.commit_write_group()
+        repo.unlock()
         (out, err) = self.run_bzr('reconcile')
         self.assertEqualDiff(out, "Reconciling repository %s\n"
                                   "Backup Inventory created.\n"