Rev 5044: (Jelmer) Remove Repository._serialise_inventory_to_{lines, string}. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Wed Feb 17 17:53:31 GMT 2010


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

------------------------------------------------------------
revno: 5044 [merge]
revision-id: pqm at pqm.ubuntu.com-20100217174203-bd8elqnhq6w48xb2
parent: pqm at pqm.ubuntu.com-20100217163640-cseitbcigg7vptg7
parent: jelmer at samba.org-20100217160211-t3jblaez3ifr40pp
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2010-02-17 17:42:03 +0000
message:
  (Jelmer) Remove Repository._serialise_inventory_to_{lines,string}.
modified:
  bzrlib/foreign.py              foreign.py-20081112170002-olsxmandkk8qyfuq-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
=== modified file 'bzrlib/foreign.py'
--- a/bzrlib/foreign.py	2010-02-15 20:23:34 +0000
+++ b/bzrlib/foreign.py	2010-02-15 20:50:06 +0000
@@ -225,10 +225,6 @@
         """Get the default mapping for this repository."""
         raise NotImplementedError(self.get_default_mapping)
 
-    def _get_inventory_xml(self, revision_id):
-        """See Repository._get_inventory_xml()."""
-        return self._serialise_inventory(self.get_inventory(revision_id))
-
 
 class ForeignBranch(Branch):
     """Branch that exists in a foreign version control system."""

=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2010-02-17 15:50:09 +0000
+++ b/bzrlib/repository.py	2010-02-17 17:42:03 +0000
@@ -1027,7 +1027,7 @@
 
         :seealso: add_inventory, for the contract.
         """
-        inv_lines = self._serialise_inventory_to_lines(inv)
+        inv_lines = self._serializer.write_inventory_to_lines(inv)
         return self._inventory_add_lines(revision_id, parents,
             inv_lines, check_content=False)
 
@@ -2413,12 +2413,6 @@
                 result.revision_id, revision_id))
         return result
 
-    def _serialise_inventory(self, inv):
-        return self._serializer.write_inventory_to_string(inv)
-
-    def _serialise_inventory_to_lines(self, inv):
-        return self._serializer.write_inventory_to_lines(inv)
-
     def get_serializer_format(self):
         return self._serializer.format_num
 




More information about the bazaar-commits mailing list