Rev 3888: Use a last-modified-revision test. in http://bzr.arbash-meinel.com/branches/bzr/1.11/differ_serializer

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.11/differ_serializer

------------------------------------------------------------
revno: 3888
revision-id: john at arbash-meinel.com-20081205222204-fjc7ze2rp3tm5s4s
parent: john at arbash-meinel.com-20081205221928-kzstz04ngqrxpb12
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: differ_serializer
timestamp: Fri 2008-12-05 16:22:04 -0600
message:
  Use a last-modified-revision test.
  
  This avoids copying the same text revisions multiple times.
-------------- next part --------------
=== modified file 'bzrlib/repofmt/pack_repo.py'
--- a/bzrlib/repofmt/pack_repo.py	2008-12-01 19:07:21 +0000
+++ b/bzrlib/repofmt/pack_repo.py	2008-12-05 22:22:04 +0000
@@ -1309,7 +1309,13 @@
             'containing %d revisions. Packing %d files into %d affecting %d'
             ' revisions', self, total_packs, total_revisions, num_old_packs,
             num_new_packs, num_revs_affected)
+        import subprocess
+        pack_path = self.transport.local_abspath('packs')
+        print
+        subprocess.call('du -ksh %s' % (pack_path,), shell=True)
         self._execute_pack_operations(pack_operations)
+        print
+        subprocess.call('du -ksh %s' % (pack_path,), shell=True)
         return True
 
     def _execute_pack_operations(self, pack_operations, _packer_class=Packer):

=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2008-12-05 22:19:28 +0000
+++ b/bzrlib/repository.py	2008-12-05 22:22:04 +0000
@@ -3207,7 +3207,8 @@
                         continue
                     # TODO: Do we need:
                     #       "if entry.revision == current_revision_id" ?
-                    text_keys.add((file_id, entry.revision))
+                    if entry.revision == current_revision_id:
+                        text_keys.add((file_id, entry.revision))
             revision = self.source.get_revision(current_revision_id)
             pending_deltas.append((basis_id, delta,
                 current_revision_id, revision.parent_ids))