Rev 3037: * ``check`` no longer reports spurious unreferenced text versions. in http://people.ubuntu.com/~robertc/baz2.0/check

Robert Collins robertc at robertcollins.net
Tue Nov 27 21:58:57 GMT 2007


At http://people.ubuntu.com/~robertc/baz2.0/check

------------------------------------------------------------
revno: 3037
revision-id:robertc at robertcollins.net-20071127215836-300j320ru8mbyl85
parent: pqm at pqm.ubuntu.com-20071127143838-lkx79x6q91uptc1o
committer: Robert Collins <robertc at robertcollins.net>
branch nick: check
timestamp: Wed 2007-11-28 08:58:36 +1100
message:
  * ``check`` no longer reports spurious unreferenced text versions.
    (Robert Collins, John A Meinel, #162931, #165071)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
  bzrlib/tests/repository_implementations/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
=== modified file 'NEWS'
--- a/NEWS	2007-11-27 14:38:38 +0000
+++ b/NEWS	2007-11-27 21:58:36 +0000
@@ -79,6 +79,9 @@
    * Catch connection errors for ftp.
      (Vincent Ladeuil, #164567)
 
+   * ``check`` no longer reports spurious unreferenced text versions.
+     (Robert Collins, John A Meinel, #162931, #165071)
+
    * Conflicts are now resolved recursively by ``revert``.
      (Aaron Bentley, #102739)
 

=== modified file 'bzrlib/check.py'
--- a/bzrlib/check.py	2007-11-16 01:28:59 +0000
+++ b/bzrlib/check.py	2007-11-27 21:58:36 +0000
@@ -210,7 +210,7 @@
             # No progress here, because it looks ugly.
             w.check()
             result = weave_checker.check_file_version_parents(w, weave_id,
-                self.planned_revisions)
+                w.versions())
             bad_parents, unused_versions = result
             bad_parents = bad_parents.items()
             for revision_id, (weave_parents, correct_parents) in bad_parents:

=== modified file 'bzrlib/tests/repository_implementations/test_check.py'
--- a/bzrlib/tests/repository_implementations/test_check.py	2007-11-16 01:28:59 +0000
+++ b/bzrlib/tests/repository_implementations/test_check.py	2007-11-27 21:58:36 +0000
@@ -30,6 +30,27 @@
     )
 
 
+class TestNoSpuriousInconsistentAncestors(TestCaseWithRepository):
+
+    def test_two_files_different_versions_no_inconsistencies_bug_165071(self):
+        """Two files, with different versions can be clean."""
+        tree = self.make_branch_and_tree('.')
+        self.build_tree(['foo'])
+        tree.smart_add(['.'])
+        tree.commit('1')
+        self.build_tree(['bar'])
+        tree.smart_add(['.'])
+        tree.commit('2')
+        # XXX: check requires a non-empty revision IDs list, but it ignores the
+        # contents of it!
+        check_object = tree.branch.repository.check(['ignored'])
+        check_object.report_results(verbose=False)
+        log = self._get_log(keep_log_file=True)
+        self.assertContainsRe(
+            log,
+            "0 unreferenced text versions")
+
+
 class TestFindInconsistentRevisionParents(TestCaseWithBrokenRevisionIndex):
 
     def test__find_inconsistent_revision_parents(self):



More information about the bazaar-commits mailing list