##// END OF EJS Templates
merge with crew.
Vadim Gelfer -
r2194:ee90e5a9 merge default
parent child Browse files
Show More
@@ -231,7 +231,7 b' def canonpath(root, cwd, myname):'
231 name_st = os.stat(name)
231 name_st = os.stat(name)
232 except OSError:
232 except OSError:
233 break
233 break
234 if os.path.samestat(name_st, root_st):
234 if samestat(name_st, root_st):
235 rel.reverse()
235 rel.reverse()
236 name = os.path.join(*rel)
236 name = os.path.join(*rel)
237 audit_path(name)
237 audit_path(name)
@@ -561,6 +561,9 b" if os.name == 'nt':"
561 makelock = _makelock_file
561 makelock = _makelock_file
562 readlock = _readlock_file
562 readlock = _readlock_file
563
563
564 def samestat(s1, s2):
565 return False
566
564 def explain_exit(code):
567 def explain_exit(code):
565 return _("exited with status %d") % code, code
568 return _("exited with status %d") % code, code
566
569
@@ -627,6 +630,7 b' else:'
627 return path
630 return path
628
631
629 normpath = os.path.normpath
632 normpath = os.path.normpath
633 samestat = os.path.samestat
630
634
631 def makelock(info, pathname):
635 def makelock(info, pathname):
632 try:
636 try:
General Comments 0
You need to be logged in to leave comments. Login now