| durham |
| hg-reviewers |
Changeset 5fc4ddfbe626 introduce more complex logic around
'bundleoperation.gettransaction'. In that process it turns the old "attribute"
into a proper method which breaks the code that detects the "transaction
availability".
The change was visible in 'test-acl.t', fixing this reverts the test changes.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| # todo: | # todo: | ||||
| # - replace this is a init function soon. | # - replace this is a init function soon. | ||||
| # - exception catching | # - exception catching | ||||
| unbundler.params | unbundler.params | ||||
| if repo.ui.debugflag: | if repo.ui.debugflag: | ||||
| msg = ['bundle2-input-bundle:'] | msg = ['bundle2-input-bundle:'] | ||||
| if unbundler.params: | if unbundler.params: | ||||
| msg.append(' %i params' % len(unbundler.params)) | msg.append(' %i params' % len(unbundler.params)) | ||||
| if op.gettransaction is None or op.gettransaction is _notransaction: | if op._gettransaction is None or op._gettransaction is _notransaction: | ||||
| msg.append(' no-transaction') | msg.append(' no-transaction') | ||||
| else: | else: | ||||
| msg.append(' with-transaction') | msg.append(' with-transaction') | ||||
| msg.append('\n') | msg.append('\n') | ||||
| repo.ui.debug(''.join(msg)) | repo.ui.debug(''.join(msg)) | ||||
| iterparts = enumerate(unbundler.iterparts()) | iterparts = enumerate(unbundler.iterparts()) | ||||
| part = None | part = None | ||||
| nbpart = 0 | nbpart = 0 | ||||
| bundle2-input-part: total payload size 1553 | bundle2-input-part: total payload size 1553 | ||||
| bundle2-input-part: "pushkey" (params: 4 mandatory) supported | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | ||||
| pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | ||||
| bundle2-input-bundle: 3 parts total | bundle2-input-bundle: 3 parts total | ||||
| updating the branch cache | updating the branch cache | ||||
| bundle2-output-bundle: "HG20", 2 parts total | bundle2-output-bundle: "HG20", 2 parts total | ||||
| bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | ||||
| bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | ||||
| bundle2-input-bundle: with-transaction | bundle2-input-bundle: no-transaction | ||||
| bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | ||||
| bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | ||||
| bundle2-input-bundle: 1 parts total | bundle2-input-bundle: 1 parts total | ||||
| listing keys for "phases" | listing keys for "phases" | ||||
| repository tip rolled back to revision 0 (undo push) | repository tip rolled back to revision 0 (undo push) | ||||
| 0:6675d58eff77 | 0:6675d58eff77 | ||||
| bundle2-input-part: total payload size 1553 | bundle2-input-part: total payload size 1553 | ||||
| bundle2-input-part: "pushkey" (params: 4 mandatory) supported | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | ||||
| pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | ||||
| bundle2-input-bundle: 3 parts total | bundle2-input-bundle: 3 parts total | ||||
| updating the branch cache | updating the branch cache | ||||
| bundle2-output-bundle: "HG20", 2 parts total | bundle2-output-bundle: "HG20", 2 parts total | ||||
| bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | ||||
| bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | ||||
| bundle2-input-bundle: with-transaction | bundle2-input-bundle: no-transaction | ||||
| bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | ||||
| bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | ||||
| bundle2-input-bundle: 1 parts total | bundle2-input-bundle: 1 parts total | ||||
| listing keys for "phases" | listing keys for "phases" | ||||
| repository tip rolled back to revision 0 (undo push) | repository tip rolled back to revision 0 (undo push) | ||||
| 0:6675d58eff77 | 0:6675d58eff77 | ||||
| bundle2-input-part: total payload size 1553 | bundle2-input-part: total payload size 1553 | ||||
| bundle2-input-part: "pushkey" (params: 4 mandatory) supported | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | ||||
| pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | ||||
| bundle2-input-bundle: 3 parts total | bundle2-input-bundle: 3 parts total | ||||
| updating the branch cache | updating the branch cache | ||||
| bundle2-output-bundle: "HG20", 2 parts total | bundle2-output-bundle: "HG20", 2 parts total | ||||
| bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | ||||
| bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | ||||
| bundle2-input-bundle: with-transaction | bundle2-input-bundle: no-transaction | ||||
| bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | ||||
| bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | ||||
| bundle2-input-bundle: 1 parts total | bundle2-input-bundle: 1 parts total | ||||
| listing keys for "phases" | listing keys for "phases" | ||||
| repository tip rolled back to revision 0 (undo push) | repository tip rolled back to revision 0 (undo push) | ||||
| 0:6675d58eff77 | 0:6675d58eff77 | ||||
| bundle2-input-part: total payload size 1553 | bundle2-input-part: total payload size 1553 | ||||
| bundle2-input-part: "pushkey" (params: 4 mandatory) supported | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | ||||
| pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | ||||
| bundle2-input-bundle: 3 parts total | bundle2-input-bundle: 3 parts total | ||||
| updating the branch cache | updating the branch cache | ||||
| bundle2-output-bundle: "HG20", 2 parts total | bundle2-output-bundle: "HG20", 2 parts total | ||||
| bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | ||||
| bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | ||||
| bundle2-input-bundle: with-transaction | bundle2-input-bundle: no-transaction | ||||
| bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | ||||
| bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | ||||
| bundle2-input-bundle: 1 parts total | bundle2-input-bundle: 1 parts total | ||||
| listing keys for "phases" | listing keys for "phases" | ||||
| repository tip rolled back to revision 0 (undo push) | repository tip rolled back to revision 0 (undo push) | ||||
| 0:6675d58eff77 | 0:6675d58eff77 | ||||
| bundle2-input-part: total payload size 1553 | bundle2-input-part: total payload size 1553 | ||||
| bundle2-input-part: "pushkey" (params: 4 mandatory) supported | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | ||||
| pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | ||||
| bundle2-input-bundle: 3 parts total | bundle2-input-bundle: 3 parts total | ||||
| updating the branch cache | updating the branch cache | ||||
| bundle2-output-bundle: "HG20", 2 parts total | bundle2-output-bundle: "HG20", 2 parts total | ||||
| bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | ||||
| bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | ||||
| bundle2-input-bundle: with-transaction | bundle2-input-bundle: no-transaction | ||||
| bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | ||||
| bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | ||||
| bundle2-input-bundle: 1 parts total | bundle2-input-bundle: 1 parts total | ||||
| listing keys for "phases" | listing keys for "phases" | ||||
| repository tip rolled back to revision 0 (undo push) | repository tip rolled back to revision 0 (undo push) | ||||
| 0:6675d58eff77 | 0:6675d58eff77 | ||||
| bundle2-input-part: total payload size 1553 | bundle2-input-part: total payload size 1553 | ||||
| bundle2-input-part: "pushkey" (params: 4 mandatory) supported | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | ||||
| pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | ||||
| bundle2-input-bundle: 3 parts total | bundle2-input-bundle: 3 parts total | ||||
| updating the branch cache | updating the branch cache | ||||
| bundle2-output-bundle: "HG20", 2 parts total | bundle2-output-bundle: "HG20", 2 parts total | ||||
| bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | ||||
| bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | ||||
| bundle2-input-bundle: with-transaction | bundle2-input-bundle: no-transaction | ||||
| bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | ||||
| bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | ||||
| bundle2-input-bundle: 1 parts total | bundle2-input-bundle: 1 parts total | ||||
| listing keys for "phases" | listing keys for "phases" | ||||
| repository tip rolled back to revision 0 (undo push) | repository tip rolled back to revision 0 (undo push) | ||||
| 0:6675d58eff77 | 0:6675d58eff77 | ||||
| bundle2-input-part: total payload size 1553 | bundle2-input-part: total payload size 1553 | ||||
| bundle2-input-part: "pushkey" (params: 4 mandatory) supported | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | ||||
| pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | pushing key for "phases:911600dab2ae7a9baff75958b84fe606851ce955" | ||||
| bundle2-input-bundle: 3 parts total | bundle2-input-bundle: 3 parts total | ||||
| updating the branch cache | updating the branch cache | ||||
| bundle2-output-bundle: "HG20", 2 parts total | bundle2-output-bundle: "HG20", 2 parts total | ||||
| bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | ||||
| bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | ||||
| bundle2-input-bundle: with-transaction | bundle2-input-bundle: no-transaction | ||||
| bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | ||||
| bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | ||||
| bundle2-input-bundle: 1 parts total | bundle2-input-bundle: 1 parts total | ||||
| listing keys for "phases" | listing keys for "phases" | ||||
| repository tip rolled back to revision 0 (undo push) | repository tip rolled back to revision 0 (undo push) | ||||
| 0:6675d58eff77 | 0:6675d58eff77 | ||||
| bundle2-input-part: "pushkey" (params: 4 mandatory) supported | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | ||||
| pushing key for "phases:e8fc755d4d8217ee5b0c2bb41558c40d43b92c01" | pushing key for "phases:e8fc755d4d8217ee5b0c2bb41558c40d43b92c01" | ||||
| bundle2-input-bundle: 4 parts total | bundle2-input-bundle: 4 parts total | ||||
| updating the branch cache | updating the branch cache | ||||
| bundle2-output-bundle: "HG20", 3 parts total | bundle2-output-bundle: "HG20", 3 parts total | ||||
| bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | ||||
| bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | ||||
| bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | ||||
| bundle2-input-bundle: with-transaction | bundle2-input-bundle: no-transaction | ||||
| bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | ||||
| bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | ||||
| bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | ||||
| bundle2-input-bundle: 2 parts total | bundle2-input-bundle: 2 parts total | ||||
| listing keys for "phases" | listing keys for "phases" | ||||
| repository tip rolled back to revision 2 (undo push) | repository tip rolled back to revision 2 (undo push) | ||||
| 2:fb35475503ef | 2:fb35475503ef | ||||
| bundle2-input-part: "pushkey" (params: 4 mandatory) supported | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | ||||
| pushing key for "phases:e8fc755d4d8217ee5b0c2bb41558c40d43b92c01" | pushing key for "phases:e8fc755d4d8217ee5b0c2bb41558c40d43b92c01" | ||||
| bundle2-input-bundle: 4 parts total | bundle2-input-bundle: 4 parts total | ||||
| updating the branch cache | updating the branch cache | ||||
| bundle2-output-bundle: "HG20", 3 parts total | bundle2-output-bundle: "HG20", 3 parts total | ||||
| bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | ||||
| bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | ||||
| bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | ||||
| bundle2-input-bundle: with-transaction | bundle2-input-bundle: no-transaction | ||||
| bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | ||||
| bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | ||||
| bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | ||||
| bundle2-input-bundle: 2 parts total | bundle2-input-bundle: 2 parts total | ||||
| listing keys for "phases" | listing keys for "phases" | ||||
| repository tip rolled back to revision 2 (undo push) | repository tip rolled back to revision 2 (undo push) | ||||
| 2:fb35475503ef | 2:fb35475503ef | ||||
| bundle2-input-part: "pushkey" (params: 4 mandatory) supported | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | ||||
| pushing key for "phases:e8fc755d4d8217ee5b0c2bb41558c40d43b92c01" | pushing key for "phases:e8fc755d4d8217ee5b0c2bb41558c40d43b92c01" | ||||
| bundle2-input-bundle: 4 parts total | bundle2-input-bundle: 4 parts total | ||||
| updating the branch cache | updating the branch cache | ||||
| bundle2-output-bundle: "HG20", 3 parts total | bundle2-output-bundle: "HG20", 3 parts total | ||||
| bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | ||||
| bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | ||||
| bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | ||||
| bundle2-input-bundle: with-transaction | bundle2-input-bundle: no-transaction | ||||
| bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | ||||
| bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | ||||
| bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | ||||
| bundle2-input-bundle: 2 parts total | bundle2-input-bundle: 2 parts total | ||||
| listing keys for "phases" | listing keys for "phases" | ||||
| repository tip rolled back to revision 2 (undo push) | repository tip rolled back to revision 2 (undo push) | ||||
| 2:fb35475503ef | 2:fb35475503ef | ||||
| bundle2-input-part: "pushkey" (params: 4 mandatory) supported | bundle2-input-part: "pushkey" (params: 4 mandatory) supported | ||||
| pushing key for "phases:e8fc755d4d8217ee5b0c2bb41558c40d43b92c01" | pushing key for "phases:e8fc755d4d8217ee5b0c2bb41558c40d43b92c01" | ||||
| bundle2-input-bundle: 4 parts total | bundle2-input-bundle: 4 parts total | ||||
| updating the branch cache | updating the branch cache | ||||
| bundle2-output-bundle: "HG20", 3 parts total | bundle2-output-bundle: "HG20", 3 parts total | ||||
| bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | ||||
| bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | ||||
| bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload | ||||
| bundle2-input-bundle: with-transaction | bundle2-input-bundle: no-transaction | ||||
| bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | ||||
| bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | ||||
| bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported | ||||
| bundle2-input-bundle: 2 parts total | bundle2-input-bundle: 2 parts total | ||||
| listing keys for "phases" | listing keys for "phases" | ||||
| repository tip rolled back to revision 2 (undo push) | repository tip rolled back to revision 2 (undo push) | ||||
| 2:fb35475503ef | 2:fb35475503ef | ||||