merge with crew.
--- a/mercurial/httprepo.py Tue Mar 28 09:04:33 2006 -0800
+++ b/mercurial/httprepo.py Wed Mar 29 10:16:04 2006 -0800
@@ -9,7 +9,7 @@
from remoterepo import *
from i18n import gettext as _
from demandload import *
-demandload(globals(), "hg os urllib urllib2 urlparse zlib util")
+demandload(globals(), "hg os urllib urllib2 urlparse zlib util httplib")
class httprepository(remoterepository):
def __init__(self, ui, path):
@@ -129,8 +129,11 @@
def zgenerator(f):
zd = zlib.decompressobj()
- for chnk in f:
- yield zd.decompress(chnk)
+ try:
+ for chnk in f:
+ yield zd.decompress(chnk)
+ except httplib.HTTPException, inst:
+ raise IOError(None, _('connection ended unexpectedly'))
yield zd.flush()
return util.chunkbuffer(zgenerator(util.filechunkiter(f)))
--- a/mercurial/ui.py Tue Mar 28 09:04:33 2006 -0800
+++ b/mercurial/ui.py Wed Mar 29 10:16:04 2006 -0800
@@ -197,10 +197,10 @@
raise
def flush(self):
- try:
- sys.stdout.flush()
- finally:
- sys.stderr.flush()
+ try: sys.stdout.flush()
+ except: pass
+ try: sys.stderr.flush()
+ except: pass
def readline(self):
return sys.stdin.readline()[:-1]
--- a/templates/filelog-gitweb.tmpl Tue Mar 28 09:04:33 2006 -0800
+++ b/templates/filelog-gitweb.tmpl Wed Mar 29 10:16:04 2006 -0800
@@ -13,6 +13,8 @@
<a href="?cmd=summary;style=gitweb">summary</a> | <a href="?cmd=changelog;style=gitweb">changelog</a> | <a href="?cmd=tags;style=gitweb">tags</a> | <a href="?cmd=file;file=#file|urlescape#;filenode=#filenode#;style=gitweb">file</a> | revisions | <a href="?cmd=annotate;file=#file|urlescape#;filenode=#filenode#;style=gitweb">annotate</a> | <a href="?fl=#filenode|short#;file=#file|urlescape#;style=rss">rss</a><br/>
</div>
+<div class="title" >#file|urlescape#</div>
+
<table>
#entries%filelogentry#
</table>
--- a/templates/summary-gitweb.tmpl Tue Mar 28 09:04:33 2006 -0800
+++ b/templates/summary-gitweb.tmpl Wed Mar 29 10:16:04 2006 -0800
@@ -14,7 +14,7 @@
<div class="title"> </div>
<table cellspacing="0">
-<tr><td>description</td><td>#desc|escape#</td></tr>
+<tr><td>description</td><td>#desc#</td></tr>
<tr><td>owner</td><td>#owner|escape#</td></tr>
<!-- <tr><td>last change</td><td>#lastchange|rfc822date#</td></tr> -->
</table>