← Back to branch summary

~bzr-pqm/bzr/bzr.dev

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/identitymap.py

Committer: Aaron Bentley
Date: 2007-02-23 05:47:26 UTC
mfrom: (2255.2.121 dirstate)
mto: (2255.2.152 dirstate)
mto: This revision was merged to the branch mainline in revision 2322.
Revision ID: aaron.bentley@utoronto.ca-20070223054726-298pl3o2u3d7lsy1

merge from dirstate

files added:
bzrlib/tests/test_workingtree_4.py

files modified:
NEWS

bzr

bzrlib/add.py

bzrlib/bundle/bundle_data.py

bzrlib/bundle/serializer/v08.py

bzrlib/dirstate.py

bzrlib/generate_ids.py

bzrlib/identitymap.py

bzrlib/inventory.py

bzrlib/lock.py

bzrlib/mutabletree.py

bzrlib/osutils.py

bzrlib/repository.py

bzrlib/revisiontree.py

bzrlib/store/__init__.py

bzrlib/store/versioned/__init__.py

bzrlib/testament.py

bzrlib/tests/__init__.py

bzrlib/tests/blackbox/test_add.py

bzrlib/tests/blackbox/test_status.py

bzrlib/tests/intertree_implementations/test_compare.py

bzrlib/tests/repository_implementations/test_fileid_involved.py

bzrlib/tests/test_dirstate.py

bzrlib/tests/test_generate_ids.py

bzrlib/tests/test_osutils.py

bzrlib/tests/test_workingtree.py

bzrlib/tests/test_xml.py

bzrlib/tests/tree_implementations/__init__.py

bzrlib/tests/tree_implementations/test_test_trees.py

bzrlib/tests/tree_implementations/test_walkdirs.py

bzrlib/tests/workingtree_implementations/test_set_root_id.py

bzrlib/tests/workingtree_implementations/test_workingtree.py

bzrlib/tree.py

bzrlib/workingtree.py

bzrlib/workingtree_4.py

bzrlib/xml5.py

bzrlib/xml6.py

bzrlib/xml7.py

Show diffs side-by-side

added added

removed removed

bzrlib/identitymap.py

18

18

"""This module provides an IdentityMap."""

19

19

20

20

21

import bzrlib.errors as errors

21

from bzrlib import (

22

errors,

23

osutils,

24

)

22

25

23

26

24

27

class IdentityMap(object):

Older »