equal
deleted
inserted
replaced
173 raise ValueError('unknown bundle compression type') |
173 raise ValueError('unknown bundle compression type') |
174 gen = changegroupmod.unbundle(header, fp) |
174 gen = changegroupmod.unbundle(header, fp) |
175 |
175 |
176 # send addchangegroup output to client |
176 # send addchangegroup output to client |
177 |
177 |
178 old_stdout = sys.stdout |
178 oldio = sys.stdout, sys.stderr |
179 sys.stdout = cStringIO.StringIO() |
179 sys.stderr = sys.stdout = cStringIO.StringIO() |
180 |
180 |
181 try: |
181 try: |
182 url = 'remote:%s:%s' % (proto, |
182 url = 'remote:%s:%s' % (proto, |
183 req.env.get('REMOTE_HOST', '')) |
183 req.env.get('REMOTE_HOST', '')) |
184 try: |
184 try: |
186 except util.Abort, inst: |
186 except util.Abort, inst: |
187 sys.stdout.write("abort: %s\n" % inst) |
187 sys.stdout.write("abort: %s\n" % inst) |
188 ret = 0 |
188 ret = 0 |
189 finally: |
189 finally: |
190 val = sys.stdout.getvalue() |
190 val = sys.stdout.getvalue() |
191 sys.stdout = old_stdout |
191 sys.stdout, sys.stderr = oldio |
192 req.write('%d\n' % ret) |
192 req.write('%d\n' % ret) |
193 req.write(val) |
193 req.write(val) |
194 finally: |
194 finally: |
195 del lock |
195 del lock |
196 except ValueError, inst: |
196 except ValueError, inst: |