equal
deleted
inserted
replaced
657 # very crude first implementation, |
657 # very crude first implementation, |
658 # the bundle API will change and the generation will be done lazily. |
658 # the bundle API will change and the generation will be done lazily. |
659 bundler = bundle2.bundle20(repo.ui) |
659 bundler = bundle2.bundle20(repo.ui) |
660 part = bundle2.bundlepart('changegroup', data=cg.getchunks()) |
660 part = bundle2.bundlepart('changegroup', data=cg.getchunks()) |
661 bundler.addpart(part) |
661 bundler.addpart(part) |
662 return bundle2.unbundle20(repo.ui, util.chunkbuffer(bundler.getchunks())) |
662 return util.chunkbuffer(bundler.getchunks()) |
663 |
663 |
664 class PushRaced(RuntimeError): |
664 class PushRaced(RuntimeError): |
665 """An exception raised during unbundling that indicate a push race""" |
665 """An exception raised during unbundling that indicate a push race""" |
666 |
666 |
667 def check_heads(repo, their_heads, context): |
667 def check_heads(repo, their_heads, context): |