comparison mercurial/hgweb/hgweb_mod.py @ 4096:49237d6ae97d

merge with crew-stable
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 16 Feb 2007 05:27:37 -0200
parents 51e52db6b40d 6fa7a2d0fc2e
children 5c1e18bb804c
comparison
equal deleted inserted replaced
4085:719488a98ebe 4096:49237d6ae97d
1132 sys.stdout = cStringIO.StringIO() 1132 sys.stdout = cStringIO.StringIO()
1133 1133
1134 try: 1134 try:
1135 url = 'remote:%s:%s' % (proto, 1135 url = 'remote:%s:%s' % (proto,
1136 req.env.get('REMOTE_HOST', '')) 1136 req.env.get('REMOTE_HOST', ''))
1137 ret = self.repo.addchangegroup(util.chunkbuffer(gen), 1137 try:
1138 'serve', url) 1138 ret = self.repo.addchangegroup(util.chunkbuffer(gen),
1139 'serve', url)
1140 except util.Abort, inst:
1141 sys.stdout.write("abort: %s\n" % inst)
1142 ret = 0
1139 finally: 1143 finally:
1140 val = sys.stdout.getvalue() 1144 val = sys.stdout.getvalue()
1141 sys.stdout = old_stdout 1145 sys.stdout = old_stdout
1142 req.write('%d\n' % ret) 1146 req.write('%d\n' % ret)
1143 req.write(val) 1147 req.write(val)