Rev 3621: (robertc) Tighten up the handling of carried over inventory entries. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3621
revision-id: pqm at pqm.ubuntu.com-20080813020322-v230uatfihz5zfm6
parent: pqm at pqm.ubuntu.com-20080812201855-9qxbdo0t2h9byzhj
parent: robertc at robertcollins.net-20080813013031-ghubj7wij3nsg0sw
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-08-13 03:03:22 +0100
message:
  (robertc) Tighten up the handling of carried over inventory entries.
  	(Robert Collins)
modified:
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
    ------------------------------------------------------------
    revno: 3619.1.2
    revision-id: robertc at robertcollins.net-20080813013031-ghubj7wij3nsg0sw
    parent: robertc at robertcollins.net-20080812071929-jf7qv5f2v7any84b
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bug-256409
    timestamp: Wed 2008-08-13 11:30:31 +1000
    message:
      Review feedback.
    modified:
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
    ------------------------------------------------------------
    revno: 3619.1.1
    revision-id: robertc at robertcollins.net-20080812071929-jf7qv5f2v7any84b
    parent: pqm at pqm.ubuntu.com-20080811083307-tbibm26paa3r4hg8
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bug-256409
    timestamp: Tue 2008-08-12 17:19:29 +1000
    message:
      Tighten up the handling of carried-over inventory entries.
    modified:
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2008-07-31 06:26:44 +0000
+++ b/bzrlib/repository.py	2008-08-13 01:30:31 +0000
@@ -291,8 +291,14 @@
             else:
                 # we don't need to commit this, because the caller already
                 # determined that an existing revision of this file is
-                # appropriate.
-                return None, (ie.revision == self._new_revision_id)
+                # appropriate. If its not being considered for committing then
+                # it and all its parents to the root must be unaltered so
+                # no-change against the basis.
+                if ie.revision == self._new_revision_id:
+                    raise AssertionError("Impossible situation, a skipped "
+                        "inventory entry (%r) claims to be modified in this "
+                        "commit (%r).", (ie, self._new_revision_id))
+                return None, False
         # XXX: Friction: parent_candidates should return a list not a dict
         #      so that we don't have to walk the inventories again.
         parent_candiate_entries = ie.parent_candidates(parent_invs)