Mercurial > hg > mercurial-crew-with-dirclash

changeset 4612:86e5500a517e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: lazify and lambdafy _slash
author Matt Mackall <mpm@selenic.com>
date Mon, 18 Jun 2007 13:24:34 -0500
parents 274c99fc629f
children 17ee7407097f
files mercurial/dirstate.py
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -22,7 +22,6 @@ class dirstate(object):
         self.root = root
         self.dirty = 0
         self.ui = ui
-        self._slash = None
 
     def __getattr__(self, name):
         if name == 'map':
@@ -56,6 +55,9 @@ class dirstate(object):
             files = [self.wjoin('.hgignore')] + self.ui.hgignorefiles()
             self._ignore = ignore.ignore(self.root, files, self.ui.warn)
             return self._ignore
+        elif name == '_slash':
+            self._slash = self.ui.configbool('ui', 'slash') and os.sep != '/'
+            return self._slash
         else:
             raise AttributeError, name
 
@@ -79,10 +81,8 @@ class dirstate(object):
         if cwd is None:
             cwd = self.getcwd()
         path = util.pathto(self.root, cwd, f)
-        if self._slash is None:
-            self._slash = self.ui.configbool('ui', 'slash') and os.sep != '/'
         if self._slash:
-            path = path.replace(os.sep, '/')
+            return path.replace(os.sep, '/')
         return path
 
     def __del__(self):