Show More
@@ -902,7 +902,7 b' def obsmarkersversion(caps):' | |||||
902 | obscaps = caps.get('b2x:obsmarkers', ()) |
|
902 | obscaps = caps.get('b2x:obsmarkers', ()) | |
903 | return [int(c[1:]) for c in obscaps if c.startswith('V')] |
|
903 | return [int(c[1:]) for c in obscaps if c.startswith('V')] | |
904 |
|
904 | |||
905 | @parthandler('b2x:changegroup') |
|
905 | @parthandler('b2x:changegroup', ('version',)) | |
906 | def handlechangegroup(op, inpart): |
|
906 | def handlechangegroup(op, inpart): | |
907 | """apply a changegroup part on the repo |
|
907 | """apply a changegroup part on the repo | |
908 |
|
908 | |||
@@ -915,7 +915,10 b' def handlechangegroup(op, inpart):' | |||||
915 | # we need to make sure we trigger the creation of a transaction object used |
|
915 | # we need to make sure we trigger the creation of a transaction object used | |
916 | # for the whole processing scope. |
|
916 | # for the whole processing scope. | |
917 | op.gettransaction() |
|
917 | op.gettransaction() | |
918 | cg = changegroup.cg1unpacker(inpart, 'UN') |
|
918 | unpackerversion = inpart.params.get('version', '01') | |
|
919 | # We should raise an appropriate exception here | |||
|
920 | unpacker = changegroup.packermap[unpackerversion][1] | |||
|
921 | cg = unpacker(inpart, 'UN') | |||
919 | # the source and url passed here are overwritten by the one contained in |
|
922 | # the source and url passed here are overwritten by the one contained in | |
920 | # the transaction.hookargs argument. So 'bundle2' is a placeholder |
|
923 | # the transaction.hookargs argument. So 'bundle2' is a placeholder | |
921 | ret = changegroup.addchangegroup(op.repo, cg, 'bundle2', 'bundle2') |
|
924 | ret = changegroup.addchangegroup(op.repo, cg, 'bundle2', 'bundle2') |
General Comments 0
You need to be logged in to leave comments.
Login now