equal
deleted
inserted
replaced
784 # push can proceed |
784 # push can proceed |
785 fp.seek(0) |
785 fp.seek(0) |
786 gen = changegroupmod.readbundle(fp, None) |
786 gen = changegroupmod.readbundle(fp, None) |
787 |
787 |
788 try: |
788 try: |
789 r = repo.addchangegroup(gen, 'serve', proto._client()) |
789 r = changegroupmod.addchangegroup(repo, gen, 'serve', |
|
790 proto._client()) |
790 except util.Abort, inst: |
791 except util.Abort, inst: |
791 sys.stderr.write("abort: %s\n" % inst) |
792 sys.stderr.write("abort: %s\n" % inst) |
792 finally: |
793 finally: |
793 lock.release() |
794 lock.release() |
794 return pushres(r) |
795 return pushres(r) |