← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/memorytree.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/memorytree.py
37
37
 
38
38
class MemoryTree(mutabletree.MutableTree):
39
39
    """A MemoryTree is a specialisation of MutableTree.
40
 
    
 
40
 
41
41
    It maintains nearly no state outside of read_lock and write_lock
42
42
    transactions. (it keeps a reference to the branch, and its last-revision
43
43
    only).
74
74
 
75
75
    def _gather_kinds(self, files, kinds):
76
76
        """See MutableTree._gather_kinds.
77
 
        
 
77
 
78
78
        This implementation does not care about the file kind of
79
79
        missing files, so is a no-op.
80
80
        """