# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1228482599 -3600
# Node ID 0107b6de1a3558db9bd7a8f92e60b23e986a4847
# Parent  16b690351c0d4f2bbccfbf70d0f12901ff52267d# Parent  9ea5ac3258b6c5549fa53dc94295dde0af192762
Merge with stable

diff -r 16b690351c0d -r 0107b6de1a35 tests/get-with-headers.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/get-with-headers.py	Fri Dec 05 14:09:59 2008 +0100
@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+
+__doc__ = """This does HTTP get requests given a host:port and path and returns
+a subset of the headers plus the body of the result."""
+
+import httplib, sys
+
+try:
+    import msvcrt, os
+    msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
+    msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
+except ImportError:
+    pass
+
+headers = [h.lower() for h in sys.argv[3:]]
+conn = httplib.HTTPConnection(sys.argv[1])
+conn.request("GET", sys.argv[2])
+response = conn.getresponse()
+print response.status, response.reason
+for h in headers:
+    if response.getheader(h, None) is not None:
+        print "%s: %s" % (h, response.getheader(h))
+print
+sys.stdout.write(response.read())
+
+if 200 <= response.status <= 299:
+    sys.exit(0)
+sys.exit(1)
diff -r 16b690351c0d -r 0107b6de1a35 tests/test-keyword
--- a/tests/test-keyword	Tue Nov 25 18:13:05 2008 +0100
+++ b/tests/test-keyword	Fri Dec 05 14:09:59 2008 +0100
@@ -104,7 +104,7 @@
 EOF
 
 echo % pull from bundle
-hg pull -u ../kw.hg 2>&1 | sed -e '/^Date:/,/^diffs (/ d'
+hg pull -u ../kw.hg 2>&1 | sed -e '/^Content-Type:/,/^diffs (/ d'
 
 echo % remove notify config
 sed -e '/\[hooks\]/,$ d' $HGRCPATH > $HGRCPATH.nonotify
diff -r 16b690351c0d -r 0107b6de1a35 tests/test-keyword.out
--- a/tests/test-keyword.out	Tue Nov 25 18:13:05 2008 +0100
+++ b/tests/test-keyword.out	Fri Dec 05 14:09:59 2008 +0100
@@ -416,7 +416,7 @@
 # User User Name <user@example.com>
 # Date 3 0
 # Node ID cfa68229c1167443337266ebac453c73b1d5d16e
-# Parent bb948857c743469b22bbf51f7ec8112279ca5d83
+# Parent  bb948857c743469b22bbf51f7ec8112279ca5d83
 xa
 
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000