Small patch for CHK branch to fix some tests

[Martin Pool]

On Tue, Nov 4, 2008 at 12:40 PM, Andrew Bennetts
<andrew.bennetts at canonical.com> wrote:
> Hi Robert,
>
> I haven't run the full suite, but this patch appears to help at least
> test_upgrade_preserves_signatures, and makes one variant of test_fetch_knit3 get
> a little further along too.  I bumped into these yesterday while playing with
> usertest on your branch.

Here's an analogous change to commit, which is needed for commit to
work when a CHK RevisionTree is used as the basis.

I think the XXX comment just here would be a good idea -- it should be
possible to remove this method -- but I don't want to do it right now.

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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mbp at sourcefrog.net-20081110060816-awjurbz1zq485qtu
# target_branch: http://sourcefrog.net/bzr/robertc-repository
# testament_sha1: 0b4242e3e13a1c408bdf9ae4f3e6b4087125e170
# timestamp: 2008-11-10 16:08:36 +1000
# source_branch: http://sourcefrog.net/bzr/repository-trivial
# base_revision_id: robertc at robertcollins.net-20081106231431-\
#   km10poyn95ifnjkh
#
# Begin patch
=== modified file 'bzrlib/commit.py'
--- bzrlib/commit.py	2008-11-06 23:00:22 +0000
+++ bzrlib/commit.py	2008-11-10 06:08:16 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007 Canonical Ltd
+# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -698,8 +698,7 @@
     def _report_and_accumulate_deletes(self):
         # XXX: Could the list of deleted paths and ids be instead taken from
         # _populate_from_inventory?
-        deleted_ids = set(self.basis_inv._byid.keys()) - \
-            set(self.builder.new_inventory._byid.keys())
+        deleted_ids = set(self.basis_inv) - set(self.builder.new_inventory)
         if deleted_ids:
             self.any_entries_deleted = True
             deleted = [(self.basis_tree.id2path(file_id), file_id)

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcUkVFMAAYrfgAQQWWf//1oG
QAC////wUAONK9u13Xp6rN6gkkRlJ4aiaZkNGiZTeiaTI2p6j1NMgklMUeTRoieRHqGgA0AAACUT
I1KeKe1ED1PUAGgADQ0NAklMmpo0ATDQNGhGmCaYIwCSij0yNNGiaMpoBoGgDQAaOx4XUN79jPa2
YnTDKls2LO+YDSM9ommSf+e1NGU5hp9QpUhIySWDy4yWquWF9y+enNr4JsytL7aFT37ei1wz9eVx
TxrfuuaysTnZXiNffsTFNvx61S34uuI7UINvBYhWKyL8rtX+a/t4phba1kNO6jb+EVwDzc7wdkme
jKJgWgxY1GQ1ljcRvuDCokBBKxUQgS1GJsTLShYPkcoqSUGI0KYFvuTgMYiRD7O4Rqf7VEipdCIq
2uKGGsvgVm8VVT7bjamJghpjN2wnIVI90PMR1HxRkpuSNqUDlC0YqXzLylwjYlhrEfBxG3POlr2n
qGR635HKaSpZWCnG8UManCoSqCBSZErwKVE0zWcYVGsk1xbLNqMCCgVGke+u8aATvGeMaIRE1xPN
aULjHGVGooGxW4DYPdpLLikmaUVBD6SgJ9xk4lrC9mM/zaRJXv7nudmZW9Thg+EiiyaWKXImzMFP
r5qMti6M0XJhf3ODt31gzm6cxywDy1XGeuo0BacTIY5t/pDlQL+8KeS5C4yxlhSeRgOMjDdBVEsz
vHwJ1AYCqMfZlI8F+ZWz/gPGJDacK0tmKLYULv5y5tPP3+kvBrytaCZOrFHR27sniRjCfm15hKs2
j/nUTlPHce5l3Fkpgp3nmY4VXvSy4D9TdEMKYnCigWQZF5WzRQMQXMigZSnaHEzAxGnhE1Ejpsve
pOVSWGxK8UPj93FgOIuvqCzXotyDmzeYoGw2qjbinGpkwlWt0cmPcy5BMDjBrJNpsuWbcLSdKqD1
V1xFNnuDWpSU8VDXNCaxVYl/OZzTUjaKzOihEc5ojHqdMLCQeDO3CJme4vTq5SJIJwmZDCfaFMwE
kSB8GS+pTzSR+0BUWuITQl25Unq7sSsMssk4pB+jvXNCAzJPwF0C18FQOC2pC2ToF5S630ZO65xs
13UXHieKhklHUFYGiVQwrMk6IzbGyW0leMKxtAEY52wViVQQRxOhBwJq7uxxZvLecW90qXkrM44a
ISLGXQyjCpPl9CeQFhxT1z2iclMU5iNAmU53brmGTmpbWufM4Uqyv4E//F3JFOFCQxSRUUw=