Mercurial > hg

changeset 2106:b03de24ee2ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Matt Mackall <mpm@selenic.com>
date Thu, 20 Apr 2006 12:13:54 -0500
parents 21cf3fe64e27 (current diff) f1085d34d20d (diff)
children 7ff92c04f8e5 25a8d116ab6a
files
diffstat 4 files changed, 21 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/appendfile.py	Thu Apr 20 12:12:03 2006 -0500
+++ b/mercurial/appendfile.py	Thu Apr 20 12:13:54 2006 -0500
@@ -131,14 +131,11 @@
             fp = open(tmpname, 'rb')
             s = fp.read()
             fp.close()
+            os.unlink(tmpname)
             fp = self.realopener(name, 'a')
             fp.write(s)
             fp.close()
 
-    def __del__(self):
-        for tmpname in self.tmpnames.itervalues():
-            os.unlink(tmpname)
-
 # files for changelog and manifest are in different appendopeners, so
 # not mixed up together.
 
--- a/mercurial/hgweb.py	Thu Apr 20 12:12:03 2006 -0500
+++ b/mercurial/hgweb.py	Thu Apr 20 12:13:54 2006 -0500
@@ -419,7 +419,8 @@
         mt = mimetypes.guess_type(f)[0]
         rawtext = text
         if util.binary(text):
-            text = "(binary:%s)" % (mt or 'data')
+            mt = mt or 'application/octet-stream'
+            text = "(binary:%s)" % mt
         mt = mt or 'text/plain'
 
         def lines():
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-committer	Thu Apr 20 12:13:54 2006 -0500
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+unset HGUSER
+EMAIL="My Name <myname@example.com>"
+export EMAIL
+
+hg init test
+cd test
+touch asdf
+hg add asdf
+hg commit -d '1000000 0' -m commit-1
+hg tip
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-committer.out	Thu Apr 20 12:13:54 2006 -0500
@@ -0,0 +1,6 @@
+changeset:   0:9426b370c206
+tag:         tip
+user:        My Name <myname@example.com>
+date:        Mon Jan 12 13:46:40 1970 +0000
+summary:     commit-1
+