# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1145553234 18000
# Node ID b03de24ee2eca0b2014e8b1e6f69a7e48ef5aad8
# Parent  21cf3fe64e275c26b042d6e61511a043a88e9b61# Parent  f1085d34d20dd2d1b4938401a52d8099a58786d8
Merge with crew



diff -r 21cf3fe64e27 -r b03de24ee2ec mercurial/appendfile.py
--- 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.
 
diff -r 21cf3fe64e27 -r b03de24ee2ec mercurial/hgweb.py
--- 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():
diff -r 21cf3fe64e27 -r b03de24ee2ec tests/test-committer
--- /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
diff -r 21cf3fe64e27 -r b03de24ee2ec tests/test-committer.out
--- /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
+