Merge lp:~lifeless/bzr/bug-416732 into lp:~bzr/bzr/trunk-old

[Robert Collins]

[Robert Collins (lifeless)]

Do not add the root directory entry to the list of expected keys during
check in non rich-root repositories. (#416732)

Basically a very shallow bug - read inventory.py in the diff :)

-Rob

[Andrew Bennetts (spiv)]

Makes sense to me.

review: Approve

[Vincent Ladeuil (vila)]

One-liner indeed, but the comment says: 'is da... below' if that's not a typo for 'is as... below',
I fail to understand it.

review: Approve

[Martin Pool (mbp)]

This should actually be merged into 2.0.

review: Approve

[Martin Pool (mbp)]

I'll send this to pqm for 2.0.

vila, the 'da...' means the hex number starting with da.

[Martin Pool (mbp)]

2009/8/28 Martin Pool <email address hidden>:
> I'll send this to pqm for 2.0.

OK, this can't actually be directly merged because it's based off
trunk not 2.0. I'll leave it for Robert to cherrypick it out, to
avoid errors.

--
Martin <http://launchpad.net/~mbp/>

[Robert Collins (lifeless)]

On Fri, 2009-08-28 at 07:18 +0000, Martin Pool wrote:
> 2009/8/28 Martin Pool <email address hidden>:
> > I'll send this to pqm for 2.0.
>
> OK, this can't actually be directly merged because it's based off
> trunk not 2.0. I'll leave it for Robert to cherrypick it out, to
> avoid errors.

Just merge -c should work fine; the 'da' typo should indeed be 'is as',
and the start_series typo will need to be start_server.

I'll correct and land first thing Monday if noone beats me to it.

-Rob

=== modified file 'NEWS'
--- NEWS	2009-08-28 22:24:40 +0000
+++ NEWS	2009-08-29 03:35:20 +0000
@@ -101,6 +101,7 @@
 Bug Fixes
 *********
 
+<<<<<<< TREE
 * Further tweaks to handling of ``bzr add`` messages about ignored files.
   (Jason Spashett, #76616)
 
@@ -110,6 +111,12 @@
   recombining to work, switching to 'unordered' fetches avoids the
   fragmentation. (John Arbash Meinel, #402645)
 
+=======
+* ``bzr check`` in pack-0.92, 1.6 and 1.9 format repositories will no
+  longer report incorrect errors about ``Missing inventory ('TREE_ROOT', ...)``
+  (Robert Collins, #416732)
+
+>>>>>>> MERGE-SOURCE
 * Fix a pycurl related test failure on karmic by recognizing an error
   raised by newer versions of pycurl.
   (Vincent Ladeuil, #306264)

=== modified file 'bzrlib/inventory.py'
--- bzrlib/inventory.py	2009-08-28 05:00:33 +0000
+++ bzrlib/inventory.py	2009-08-29 03:35:20 +0000
@@ -437,7 +437,13 @@
             self.text_id is not None):
             checker._report_items.append('directory {%s} has text in revision {%s}'
                                 % (self.file_id, rev_id))
-        # Directories are stored as ''.
+        # In non rich root repositories we do not expect a file graph for the
+        # root.
+        if self.name == '' and not checker.rich_roots:
+            return
+        # Directories are stored as an empty file, but the file should exist
+        # to provide a per-fileid log. The hash of every directory content is
+        # da... below (sha1sum('')).
         checker.add_pending_item(rev_id,
             ('texts', self.file_id, self.revision), 'text',
              'da39a3ee5e6b4b0d3255bfef95601890afd80709')

=== modified file 'bzrlib/repository.py'
--- bzrlib/repository.py	2009-08-28 05:00:33 +0000
+++ bzrlib/repository.py	2009-08-29 03:35:20 +0000
@@ -1222,7 +1222,7 @@
                     for record in getattr(self, kind).check(keys=keys[kind]):
                         if record.storage_kind == 'absent':
                             checker._report_items.append(
-                                'Missing inventory {%s}' % (record.key,))
+                                'Missing %s {%s}' % (kind, record.key,))
                         else:
                             last_object = self._check_record(kind, record,
                                 checker, last_object, current_keys[(kind,) + record.key])

=== modified file 'bzrlib/tests/per_repository/test_check.py'
--- bzrlib/tests/per_repository/test_check.py	2009-05-12 05:34:15 +0000
+++ bzrlib/tests/per_repository/test_check.py	2009-08-29 03:35:20 +0000
@@ -17,9 +17,13 @@
 
 """Test operations that check the repository for corruption"""
 
+import os
 
 from bzrlib import (
+    check,
+    config as _mod_config,
     errors,
+    inventory,
     revision as _mod_revision,
     )
 from bzrlib.tests import TestNotApplicable
@@ -125,3 +129,23 @@
     def branch_callback(self, refs):
         self.callbacks.append(('branch', refs))
         return self.branch_check(refs)
+
+
+class TestCleanRepository(TestCaseWithRepository):
+
+    def test_new_repo(self):
+        repo = self.make_repository('foo')
+        repo.lock_write()
+        self.addCleanup(repo.unlock)
+        config = _mod_config.Config()
+        os.environ['BZR_EMAIL'] = '[e-mail]'
+        builder = repo.get_commit_builder(None, [], config)
+        list(builder.record_iter_changes(None, _mod_revision.NULL_REVISION, [
+            ('TREE_ROOT', (None, ''), True, (False, True), (None, None),
+            (None, ''), (None, 'directory'), (None, False))]))
+        builder.finish_inventory()
+        rev_id = builder.commit('first post')
+        result = repo.check(None, check_repo=True)
+        result.report_results(True)
+        log = self._get_log(keep_log_file=True)
+        self.assertFalse('Missing' in log, "Something was missing in %r" % log)