equal
deleted
inserted
replaced
1451 h = inpart.read(20) |
1451 h = inpart.read(20) |
1452 assert not h |
1452 assert not h |
1453 # Trigger a transaction so that we are guaranteed to have the lock now. |
1453 # Trigger a transaction so that we are guaranteed to have the lock now. |
1454 if op.ui.configbool('experimental', 'bundle2lazylocking'): |
1454 if op.ui.configbool('experimental', 'bundle2lazylocking'): |
1455 op.gettransaction() |
1455 op.gettransaction() |
1456 if heads != op.repo.heads(): |
1456 if sorted(heads) != sorted(op.repo.heads()): |
1457 raise error.PushRaced('repository changed while pushing - ' |
1457 raise error.PushRaced('repository changed while pushing - ' |
1458 'please try again') |
1458 'please try again') |
1459 |
1459 |
1460 @parthandler('output') |
1460 @parthandler('output') |
1461 def handleoutput(op, inpart): |
1461 def handleoutput(op, inpart): |