Rev 2932: Review feedback. in http://people.ubuntu.com/~robertc/baz2.0/dirstate.update_basis

[Robert Collins]

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

------------------------------------------------------------
revno: 2932
revision-id:robertc at robertcollins.net-20071024201121-0h1xkei0p1pf4diy
parent: robertc at robertcollins.net-20071024054739-r4gjnintzwhnvg82
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.update_basis
timestamp: Thu 2007-10-25 06:11:21 +1000
message:
  Review feedback.
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
  bzrlib/tests/blackbox/test_check.py test_check.py-20071024054728-mn44rt3z5hnqcbke-1
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2007-10-24 05:47:39 +0000
+++ b/bzrlib/builtins.py	2007-10-24 20:11:21 +0000
@@ -2384,7 +2384,7 @@
                 try:
                     repo_basis = tree.branch.repository.revision_tree(
                         tree.last_revision())
-                    if len(list(tree_basis._iter_changes(repo_basis))):
+                    if len(list(repo_basis._iter_changes(tree_basis))):
                         raise errors.BzrCheckError(
                             "Mismatched basis inventory content.")
                     tree._validate()

=== modified file 'bzrlib/dirstate.py'
--- a/bzrlib/dirstate.py	2007-10-24 05:47:39 +0000
+++ b/bzrlib/dirstate.py	2007-10-24 20:11:21 +0000
@@ -1276,7 +1276,9 @@
         pairs.
 
         :param adds: A sequence of adds. Each add is a tuple:
-            (None, new_path_utf8, file_id, (entry_details))
+            (None, new_path_utf8, file_id, (entry_details), real_add). real_add
+            is False when the add is the second half of a remove-and-reinsert
+            pair created to handle renames and deletes.
         """
         # Adds are accumulated partly from renames, so can be in any input
         # order - sort it.
@@ -1327,7 +1329,7 @@
         They may be deletes, or renames that have been split into add/delete
         pairs.
 
-        :param adds: A sequence of deletes. Each delete is a tuple:
+        :param deletes: A sequence of deletes. Each delete is a tuple:
             (old_path_utf8, new_path_utf8, file_id, None, real_delete).
             real_delete is True when the desired outcome is an actual deletion
             rather than the rename handling logic temporarily deleting a path

=== modified file 'bzrlib/tests/blackbox/test_check.py'
--- a/bzrlib/tests/blackbox/test_check.py	2007-10-24 05:47:39 +0000
+++ b/bzrlib/tests/blackbox/test_check.py	2007-10-24 20:11:21 +0000
@@ -22,5 +22,14 @@
 class TestCheck(ExternalBase):
 
     def test_check_no_tree(self):
-        branch = self.make_branch('.')
+        self.make_branch('.')
+        self.run_bzr('check')
+
+    def test_check_initial_tree(self):
+        self.make_branch_and_tree('.')
+        self.run_bzr('check')
+
+    def test_check_one_commit_tree(self):
+        tree = self.make_branch_and_tree('.')
+        tree.commit('hallelujah')
         self.run_bzr('check')