← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/memorytree.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/memorytree.py
19
19
See MemoryTree for more details.
20
20
"""
21
21
 
 
22
from __future__ import absolute_import
22
23
 
23
24
import os
24
25
 
50
51
        self._locks = 0
51
52
        self._lock_mode = None
52
53
 
 
54
    def get_config_stack(self):
 
55
        return self.branch.get_config_stack()
 
56
 
53
57
    def is_control_filename(self, filename):
54
58
        # Memory tree doesn't have any control filenames
55
59
        return False