← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml5.py

  • Committer: John Arbash Meinel
  • Date: 2009-06-12 18:05:15 UTC
  • mto: (4371.4.5 vila-better-heads)
  • mto: This revision was merged to the branch mainline in revision 4449.
  • Revision ID: john@arbash-meinel.com-20090612180515-t0cwbjsnve094oik
Add a failing test for handling nodes that are in the same linear chain.

It fails because the ancestry skipping causes us to miss the fact that the two nodes
are actually directly related. We could check at the beginning, as the 
code used to do, but I think that will be incomplete for the more-than-two
heads cases.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml5.py
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
30
30
    format_num = '5'
31
31
    root_id = inventory.ROOT_ID
32
32
 
33
 
    def _unpack_inventory(self, elt, revision_id, entry_cache=None,
34
 
                          return_from_cache=False):
 
33
    def _unpack_inventory(self, elt, revision_id, entry_cache=None):
35
34
        """Construct from XML Element
36
35
        """
37
36
        root_id = elt.get('file_id') or inventory.ROOT_ID
40
39
        format = elt.get('format')
41
40
        if format is not None:
42
41
            if format != '5':
43
 
                raise errors.BzrError("invalid format version %r on inventory"
44
 
                                      % format)
 
42
                raise BzrError("invalid format version %r on inventory"
 
43
                                % format)
45
44
        data_revision_id = elt.get('revision_id')
46
45
        if data_revision_id is not None:
47
46
            revision_id = cache_utf8.encode(data_revision_id)
55
54
        unpack_entry = self._unpack_entry
56
55
        byid = inv._byid
57
56
        for e in elt:
58
 
            ie = unpack_entry(e, entry_cache=entry_cache,
59
 
                              return_from_cache=return_from_cache)
 
57
            ie = unpack_entry(e, entry_cache=entry_cache)
60
58
            parent_id = ie.parent_id
61
59
            if parent_id is None:
62
60
                ie.parent_id = parent_id = root_id