← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/dirstate.py

  • Committer: John Arbash Meinel
  • Date: 2007-02-27 21:32:16 UTC
  • mto: (2255.11.3 dirstate)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: john@arbash-meinel.com-20070227213216-a6kogwpq49j6dgpm
Get iter_changes working again, by fixing set_parent_trees to
create trees with the correct block order.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/dirstate.py
849
849
        :return: Nothing.
850
850
        """
851
851
        assert new_entries[0][0][0:2] == ('', ''), \
852
 
            "Missing root row %r" % new_entries[0][0]
 
852
            "Missing root row %r" % (new_entries[0][0],)
853
853
        # The two blocks here are deliberate: the root block and the 
854
854
        # contents-of-root block.
855
855
        self._dirblocks = [('', []), ('', [])]
1690
1690
        # --- end generation of full tree mappings
1691
1691
 
1692
1692
        # sort and output all the entries
1693
 
        new_entries = sorted(by_path.items())
 
1693
        new_entries = sorted(by_path.items(),
 
1694
                        key=lambda entry:(entry[0][0].split('/'), entry[0][1]))
1694
1695
        self._entries_to_current_state(new_entries)
1695
1696
        self._parents = [rev_id for rev_id, tree in trees]
1696
1697
        self._ghosts = list(ghosts)