mercurial-crew-with-dirclash: comparison mercurial/util.py

equal deleted inserted replaced

-:343aeefb553b
+:d007df6daf8e
 fp.close()
 st = os.lstat(name)
 os.chmod(temp, st.st_mode)
 return temp
-class atomicfile(file):
+class atomictempfile(file):
-"""the file will only be copied on close"""
+"""the file will only be copied when rename is called"""
-def __init__(self, name, mode, atomic=False):
+def __init__(self, name, mode):
 self.__name = name
 self.temp = mktempcopy(name)
 file.__init__(self, self.temp, mode)
-def close(self):
+def rename(self):
 if not self.closed:
 file.close(self)
 rename(self.temp, self.__name)
 def __del__(self):
-self.close()
+if not self.closed:
+try:
-def o(path, mode="r", text=False, atomic=False):
+os.unlink(self.temp)
+except: pass
+file.close(self)
+class atomicfile(atomictempfile):
+"""the file will only be copied on close"""
+def __init__(self, name, mode):
+atomictempfile.__init__(self, name, mode)
+def close(self):
+self.rename()
+def __del__(self):
+self.rename()
+def o(path, mode="r", text=False, atomic=False, atomictemp=False):
 if audit_p:
 audit_path(path)
 f = os.path.join(p, path)
 if not text:
 if not os.path.isdir(d):
 os.makedirs(d)
 else:
 if atomic:
 return atomicfile(f, mode)
+elif atomictemp:
+return atomictempfile(f, mode)
 if nlink > 1:
 rename(mktempcopy(f), f)
 return file(f, mode)
 return o