/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/xml_serializer.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-19 10:59:35 UTC
  • mfrom: (6383 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6385.
  • Revision ID: jelmer@canonical.com-20111219105935-9hilixk0anu39v0f
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml_serializer.py
329
329
    return ie
330
330
 
331
331
 
332
 
def unpack_inventory_flat(elt, format_num, unpack_entry):
 
332
def unpack_inventory_flat(elt, format_num, unpack_entry,
 
333
            entry_cache=None, return_from_cache=False):
333
334
    """Unpack a flat XML inventory.
334
335
 
335
336
    :param elt: XML element for the inventory
350
351
        revision_id = cache_utf8.encode(revision_id)
351
352
    inv = inventory.Inventory(root_id=None, revision_id=revision_id)
352
353
    for e in elt:
353
 
        ie = unpack_entry(e)
 
354
        ie = unpack_entry(e, entry_cache, return_from_cache)
354
355
        inv.add(ie)
355
356
    return inv
356
357