Rev 3040: Rename function to remove _new_ (per Robert's suggestion) in http://bzr.arbash-meinel.com/branches/bzr/0.93-dev/fetch_check_parents_165290

John Arbash Meinel john at arbash-meinel.com
Fri Nov 30 21:39:21 GMT 2007


At http://bzr.arbash-meinel.com/branches/bzr/0.93-dev/fetch_check_parents_165290

------------------------------------------------------------
revno: 3040
revision-id:john at arbash-meinel.com-20071130213846-qxvz8yuyfyiftil5
parent: john at arbash-meinel.com-20071130201158-s0ex85foh34nv429
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fetch_check_parents_165290
timestamp: Fri 2007-11-30 15:38:46 -0600
message:
  Rename function to remove _new_ (per Robert's suggestion)
modified:
  bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
-------------- next part --------------
=== modified file 'bzrlib/repofmt/pack_repo.py'
--- a/bzrlib/repofmt/pack_repo.py	2007-11-30 20:11:58 +0000
+++ b/bzrlib/repofmt/pack_repo.py	2007-11-30 21:38:46 +0000
@@ -173,7 +173,7 @@
         """The text index is the name + .tix."""
         return self.index_name('text', name)
 
-    def _external_compression_parents_of_new_texts(self):
+    def _external_compression_parents_of_texts(self):
         keys = set()
         refs = set()
         for node in self.text_index.iter_all_entries():
@@ -988,7 +988,7 @@
             output_knit.add_lines_with_ghosts(
                 key[1], parents, text_lines, random_id=True, check_content=False)
         # 4) check that nothing inserted has a reference outside the keyspace.
-        missing_text_keys = self.new_pack._external_compression_parents_of_new_texts()
+        missing_text_keys = self.new_pack._external_compression_parents_of_texts()
         if missing_text_keys:
             raise errors.BzrError('Reference to missing compression parents %r'
                 % (refs - keys,))

=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2007-11-30 20:11:58 +0000
+++ b/bzrlib/repository.py	2007-11-30 21:38:46 +0000
@@ -2558,7 +2558,7 @@
         pack = Packer(self.target._pack_collection, packs, '.fetch',
             revision_ids).pack()
         if pack is not None:
-            external_refs = pack._external_compression_parents_of_new_texts()
+            external_refs = pack._external_compression_parents_of_texts()
             if external_refs:
                 index = self.target._pack_collection.text_index.combined_index
                 found_items = list(index.iter_entries(external_refs))



More information about the bazaar-commits mailing list