Mercurial > public > mercurial-scm > hg-stable

diff mercurial/dirstate.py @ 1510:755e7ac351ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use self.{w,}join when possible
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 08 Nov 2005 10:34:50 -0800
parents 91c0e8d7ddcf
children c13fce7167c2
line wrap: on
line diff
--- a/mercurial/dirstate.py	Mon Nov 07 15:40:24 2005 -0800
+++ b/mercurial/dirstate.py	Tue Nov 08 10:34:50 2005 -0800
@@ -175,7 +175,7 @@
             if state == "r":
                 self.map[f] = ('r', 0, 0, 0)
             else:
-                s = os.lstat(os.path.join(self.root, f))
+                s = os.lstat(self.wjoin(f))
                 st_size = kw.get('st_size', s.st_size)
                 st_mtime = kw.get('st_mtime', s.st_mtime)
                 self.map[f] = (state, s.st_mode, st_size, st_mtime)
@@ -332,7 +332,7 @@
         # step one, find all files that match our criteria
         files.sort()
         for ff in util.unique(files):
-            f = os.path.join(self.root, ff)
+            f = self.wjoin(ff)
             try:
                 st = os.lstat(f)
             except OSError, inst:
@@ -380,7 +380,7 @@
                 nonexistent = True
                 if not st:
                     try:
-                        f = os.path.join(self.root, fn)
+                        f = self.wjoin(fn)
                         st = os.lstat(f)
                     except OSError, inst:
                         if inst.errno != errno.ENOENT: