Rev 3778: Merge bb-core. in http://people.ubuntu.com/~robertc/baz2.0/repository

[Robert Collins]

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

------------------------------------------------------------
revno: 3778
revision-id: robertc at robertcollins.net-20081114021953-ckqpcsakzrk1ns1l
parent: robertc at robertcollins.net-20081114021312-bis8oebl2q385qz0
parent: vila at scythe-20081114020010-eg7poezqh3r0j142
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Fri 2008-11-14 13:19:53 +1100
message:
  Merge bb-core.
modified:
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
    ------------------------------------------------------------
    revno: 3768.1.7
    revision-id: vila at scythe-20081114020010-eg7poezqh3r0j142
    parent: vila at scythe-20081114015520-clot8liaizztnp3k
    parent: robertc at robertcollins.net-20081114012840-thsjm2g2xvtkk397
    committer: Vincent Ladeuil <vila at scythe>
    branch nick: work
    timestamp: Fri 2008-11-14 12:00:10 +1000
    message:
      merge brisbane-core
    modified:
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/chk_serializer.py       chk_serializer.py-20081002064345-2tofdfj2eqq01h4b-1
      bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
      bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
      bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
    ------------------------------------------------------------
    revno: 3768.1.6
    revision-id: vila at scythe-20081114015520-clot8liaizztnp3k
    parent: vila at scythe-20081114011832-7kdalxkn2kboa0zo
    committer: Vincent Ladeuil <vila at scythe>
    branch nick: work
    timestamp: Fri 2008-11-14 11:55:20 +1000
    message:
      Fix typo.
    modified:
      bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
    ------------------------------------------------------------
    revno: 3768.1.5
    revision-id: vila at scythe-20081114011832-7kdalxkn2kboa0zo
    parent: vila at scythe-20081114002549-orotmd0bfsohv88d
    committer: Vincent Ladeuil <vila at scythe>
    branch nick: work
    timestamp: Fri 2008-11-14 11:18:32 +1000
    message:
      Fix 19 intertree_implementations.test_compare.TestIterChanges failures.
      
      * inventory.py:
      (CHKInventory.iter_changes): Don't report spurious empty changes.
    modified:
      bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
    ------------------------------------------------------------
    revno: 3768.1.4
    revision-id: vila at scythe-20081114002549-orotmd0bfsohv88d
    parent: vila at scythe-20081114001123-x1tywd1qruzl5ac9
    parent: robertc at robertcollins.net-20081114001623-vfblxa8k3vhg127a
    committer: Vincent Ladeuil <vila at scythe>
    branch nick: work
    timestamp: Fri 2008-11-14 10:25:49 +1000
    message:
      merge brisbane-core @3775
    modified:
      bzrlib/chk_map.py              chk_map.py-20081001014447-ue6kkuhofvdecvxa-1
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
    ------------------------------------------------------------
    revno: 3768.1.3
    revision-id: vila at scythe-20081114001123-x1tywd1qruzl5ac9
    parent: vila at scythe-20081113053702-2v5fsmiwnt445dog
    parent: robertc at robertcollins.net-20081113063210-73nygl2cftrvpibh
    committer: Vincent Ladeuil <vila at scythe>
    branch nick: work
    timestamp: Fri 2008-11-14 10:11:23 +1000
    message:
      merge rob at 3771
    modified:
      bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
      bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
    ------------------------------------------------------------
    revno: 3768.1.2
    revision-id: vila at scythe-20081113053702-2v5fsmiwnt445dog
    parent: vila at scythe-20081113053622-8vyf3hjv9x7c3794
    parent: robertc at robertcollins.net-20081113040626-s65f050j1is2nxt7
    committer: Vincent Ladeuil <vila at scythe>
    branch nick: work
    timestamp: Thu 2008-11-13 15:37:02 +1000
    message:
      remerge rob mega-hack
    modified:
      bzrlib/chk_map.py              chk_map.py-20081001014447-ue6kkuhofvdecvxa-1
      bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
      bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
    ------------------------------------------------------------
    revno: 3768.1.1
    revision-id: vila at scythe-20081113053622-8vyf3hjv9x7c3794
    parent: robertc at robertcollins.net-20081113032056-djjm0lykam7okvit
    parent: vila at scythe-20081113031151-2y28vofooyac64d1
    committer: Vincent Ladeuil <vila at scythe>
    branch nick: work
    timestamp: Thu 2008-11-13 15:36:22 +1000
    message:
      remerge trivial fixes
    modified:
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
=== modified file 'bzrlib/inventory.py'
--- a/bzrlib/inventory.py	2008-11-14 02:13:12 +0000
+++ b/bzrlib/inventory.py	2008-11-14 02:19:53 +0000
@@ -1601,6 +1601,13 @@
             parent = (basis_parent, self_parent)
             name = (basis_name, self_name)
             executable = (basis_executable, self_executable)
+            if (not changed_content
+                and parent[0] == parent[1]
+                and name[0] == name[1]
+                and executable[0] == executable[1]):
+                # Could happen when only the revision changed for a directory
+                # for instance.
+                continue
             yield (file_id, (path_in_source, path_in_target), changed_content,
                 versioned, parent, name, kind, executable)
 

=== modified file 'bzrlib/tree.py'
--- a/bzrlib/tree.py	2008-11-13 04:06:26 +0000
+++ b/bzrlib/tree.py	2008-11-14 00:11:23 +0000
@@ -863,6 +863,7 @@
         # XXX: Ugly hack - testing only, really want a separate inter? or
         # perhaps helpers and split this function up?
         try:
+            # Only CHK inventories have id_to_entry attribute 
             self.source.inventory.id_to_entry
             self.target.inventory.id_to_entry
         except: