| durin42 |
| hg-reviewers |
When a transaction is started, we must load the hookargs from the
bundleoperation object to the transaction so that they can be used in the
transaction. Also this patch makes sure no more hookargs are added to the
bundleoperation object once the transaction starts.
This is a part of porting fb extension bundle2hooks to core.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/bundle2.py (21 lines) | |||
| M | tests/test-acl.t (22 lines) |
| * a way to record the result of processing each part, | * a way to record the result of processing each part, | ||||
| * a way to construct a bundle response when applicable. | * a way to construct a bundle response when applicable. | ||||
| """ | """ | ||||
| def __init__(self, repo, transactiongetter, captureoutput=True): | def __init__(self, repo, transactiongetter, captureoutput=True): | ||||
| self.repo = repo | self.repo = repo | ||||
| self.ui = repo.ui | self.ui = repo.ui | ||||
| self.records = unbundlerecords() | self.records = unbundlerecords() | ||||
| self.gettransaction = transactiongetter | |||||
| self.reply = None | self.reply = None | ||||
| self.captureoutput = captureoutput | self.captureoutput = captureoutput | ||||
| self.hookargs = {} | self.hookargs = {} | ||||
| self._gettransaction = transactiongetter | |||||
| def gettransaction(self): | |||||
| transaction = self._gettransaction() | |||||
| if self.hookargs is not None: | |||||
| # the ones added to the transaction supercede those added | |||||
| # to the operation. | |||||
| self.hookargs.update(transaction.hookargs) | |||||
| transaction.hookargs = self.hookargs | |||||
| # mark the hookargs as flushed. further attempts to add to | |||||
| # hookargs will result in an abort. | |||||
| self.hookargs = None | |||||
| return transaction | |||||
| def addhookargs(self, hookargs): | def addhookargs(self, hookargs): | ||||
| if self.hookargs is None: | |||||
| raise error.Abort( | |||||
| _('attempted to add hooks to operation after transaction ' | |||||
| 'started')) | |||||
| self.hookargs.update(hookargs) | self.hookargs.update(hookargs) | ||||
| class TransactionUnavailable(RuntimeError): | class TransactionUnavailable(RuntimeError): | ||||
| pass | pass | ||||
| def _notransaction(): | def _notransaction(): | ||||
| """default method to get a transaction while processing a bundle | """default method to get a transaction while processing a bundle | ||||
| 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: no-transaction | bundle2-input-bundle: with-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: no-transaction | bundle2-input-bundle: with-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: no-transaction | bundle2-input-bundle: with-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: no-transaction | bundle2-input-bundle: with-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: no-transaction | bundle2-input-bundle: with-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: no-transaction | bundle2-input-bundle: with-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: no-transaction | bundle2-input-bundle: with-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: no-transaction | bundle2-input-bundle: with-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: no-transaction | bundle2-input-bundle: with-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: no-transaction | bundle2-input-bundle: with-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: no-transaction | bundle2-input-bundle: with-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 | ||||