equal
deleted
inserted
replaced
1145 sys.stdout = cStringIO.StringIO() |
1145 sys.stdout = cStringIO.StringIO() |
1146 |
1146 |
1147 try: |
1147 try: |
1148 url = 'remote:%s:%s' % (proto, |
1148 url = 'remote:%s:%s' % (proto, |
1149 req.env.get('REMOTE_HOST', '')) |
1149 req.env.get('REMOTE_HOST', '')) |
1150 ret = self.repo.addchangegroup(util.chunkbuffer(gen), |
1150 try: |
1151 'serve', url) |
1151 ret = self.repo.addchangegroup(util.chunkbuffer(gen), |
|
1152 'serve', url) |
|
1153 except util.Abort, inst: |
|
1154 sys.stdout.write("abort: %s\n" % inst) |
|
1155 ret = 0 |
1152 finally: |
1156 finally: |
1153 val = sys.stdout.getvalue() |
1157 val = sys.stdout.getvalue() |
1154 sys.stdout = old_stdout |
1158 sys.stdout = old_stdout |
1155 req.write('%d\n' % ret) |
1159 req.write('%d\n' % ret) |
1156 req.write(val) |
1160 req.write(val) |