/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/xml7.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml7.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from __future__ import absolute_import
18
 
 
19
 
from . import (
 
17
from bzrlib import (
 
18
    inventory,
20
19
    xml6,
21
20
    )
22
21
 
26
25
 
27
26
    # this format is used by BzrBranch6
28
27
 
29
 
    supported_kinds = {'file', 'directory', 'symlink', 'tree-reference'}
30
 
    format_num = b'7'
 
28
    supported_kinds = set(['file', 'directory', 'symlink', 'tree-reference'])
 
29
    format_num = '7'
31
30
 
 
31
    def _unpack_entry(self, elt, entry_cache=None, return_from_cache=False):
 
32
        kind = elt.tag
 
33
        if not kind in self.supported_kinds:
 
34
            raise AssertionError('unsupported entry kind %s' % kind)
 
35
        if kind == 'tree-reference':
 
36
            file_id = elt.attrib['file_id']
 
37
            name = elt.attrib['name']
 
38
            parent_id = elt.attrib['parent_id']
 
39
            revision = elt.get('revision')
 
40
            reference_revision = elt.get('reference_revision')
 
41
            return inventory.TreeReference(file_id, name, parent_id, revision,
 
42
                                           reference_revision)
 
43
        else:
 
44
            return xml6.Serializer_v6._unpack_entry(self, elt,
 
45
                entry_cache=entry_cache, return_from_cache=return_from_cache)
32
46
 
33
47
serializer_v7 = Serializer_v7()