# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1150235761 25200
# Node ID 6a8f7c3f73333ba43b9ba87cc9686da7cc5da756
# Parent  42b8a1ff46cf749752bfb01ee12a454753a85958
dirstate: fix call to os.lstat when st is None

diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -455,8 +455,7 @@ class dirstate(object):
                 nonexistent = True
                 if not st:
                     try:
-                        f = self.wjoin(fn)
-                        st = os.lstat(f)
+                        st = os.lstat(self.wjoin(fn))
                     except OSError, inst:
                         if inst.errno != errno.ENOENT:
                             raise
@@ -472,7 +471,7 @@ class dirstate(object):
             # check the common case first
             if type_ == 'n':
                 if not st:
-                    st = os.stat(fn)
+                    st = os.stat(self.wjoin(fn))
                 if size >= 0 and (size != st.st_size
                                   or (mode ^ st.st_mode) & 0100):
                     modified.append(fn)