equal
deleted
inserted
replaced
2475 if not lock: |
2475 if not lock: |
2476 respond("not locked") |
2476 respond("not locked") |
2477 continue |
2477 continue |
2478 respond("") |
2478 respond("") |
2479 |
2479 |
2480 r = repo.addchangegroup(fin) |
2480 r = repo.addchangegroup(fin, 'serve') |
2481 respond(str(r)) |
2481 respond(str(r)) |
2482 |
2482 |
2483 optlist = ("name templates style address port ipv6" |
2483 optlist = ("name templates style address port ipv6" |
2484 " accesslog errorlog webdir_conf") |
2484 " accesslog errorlog webdir_conf") |
2485 for o in optlist.split(): |
2485 for o in optlist.split(): |
2699 yield chunk |
2699 yield chunk |
2700 else: |
2700 else: |
2701 raise util.Abort(_("%s: unknown bundle compression type") |
2701 raise util.Abort(_("%s: unknown bundle compression type") |
2702 % fname) |
2702 % fname) |
2703 gen = generator(util.filechunkiter(f, 4096)) |
2703 gen = generator(util.filechunkiter(f, 4096)) |
2704 modheads = repo.addchangegroup(util.chunkbuffer(gen)) |
2704 modheads = repo.addchangegroup(util.chunkbuffer(gen), 'unbundle') |
2705 return postincoming(ui, repo, modheads, opts['update']) |
2705 return postincoming(ui, repo, modheads, opts['update']) |
2706 |
2706 |
2707 def undo(ui, repo): |
2707 def undo(ui, repo): |
2708 """undo the last commit or pull (DEPRECATED) |
2708 """undo the last commit or pull (DEPRECATED) |
2709 |
2709 |