Mercurial > hg > gitweb

changeset 1479:1a3c6689ef2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix a bug where hg could remove file ending with .tmp util.opener used a fixed filename for writing tempfile instead of using the tempfile module.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 28 Oct 2005 17:18:50 -0700
parents e6dd91a88b57
children ae0d8d632b83
files mercurial/util.py
diffstat 1 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/util.py	Fri Oct 28 11:03:18 2005 -0700
+++ b/mercurial/util.py	Fri Oct 28 17:18:50 2005 -0700
@@ -377,8 +377,17 @@
                     os.makedirs(d)
             else:
                 if nlink > 1:
-                    file(f + ".tmp", "wb").write(file(f, "rb").read())
-                    rename(f+".tmp", f)
+                    d, fn = os.path.split(f)
+                    fd, temp = tempfile.mkstemp(prefix=fn, dir=d)
+                    fp = os.fdopen(fd, "wb")
+                    try:
+                        fp.write(file(f, "rb").read())
+                    except:
+                        try: os.unlink(temp)
+                        except: pass
+                        raise
+                    fp.close()
+                    rename(temp, f)
 
         return file(f, mode)