| stash |
| Restricted Project |
Previously the logic that created a bundle from a changegroup part and put it in
the store was all in the same function. Let's split it up.
This will be useful in a later part where we stop using the default bundle2 part
handling logic and instead handle each part manually (allowing us to store other
parts in the bundle).
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| # server either succeeds or aborts; no code to read | # server either succeeds or aborts; no code to read | ||||
| pushop.cgresult = 1 | pushop.cgresult = 1 | ||||
| return handlereply | return handlereply | ||||
| bundle2.capabilities[scratchbranchparttype] = () | bundle2.capabilities[scratchbranchparttype] = () | ||||
| bundle2.capabilities[scratchbookmarksparttype] = () | bundle2.capabilities[scratchbookmarksparttype] = () | ||||
| def _makebundlefile(ui, part, cgversion): | |||||
| """constructs a temporary bundle file | |||||
| """ | |||||
| fp = None | |||||
| fd, bundlefile = tempfile.mkstemp() | |||||
| try: # guards bundlefile | |||||
| try: # guards fp | |||||
| fp = os.fdopen(fd, 'wb') | |||||
| bundler = bundle2.bundle20(ui) | |||||
| cgpart = bundle2.bundlepart('changegroup', data=part.read()) | |||||
| cgpart.addparam('version', cgversion) | |||||
| bundler.addpart(cgpart) | |||||
| buf = util.chunkbuffer(bundler.getchunks()) | |||||
| fp.write(buf.read()) | |||||
| finally: | |||||
| fp.close() | |||||
| except Exception: | |||||
| try: | |||||
| os.unlink(bundlefile) | |||||
| except Exception: | |||||
| # we would rather see the original exception | |||||
| pass | |||||
| raise | |||||
| return bundlefile | |||||
| def _getrevs(bundle, oldnode, force, bookmark): | def _getrevs(bundle, oldnode, force, bookmark): | ||||
| 'extracts and validates the revs to be imported' | 'extracts and validates the revs to be imported' | ||||
| revs = [bundle[r] for r in bundle.revs('sort(bundle())')] | revs = [bundle[r] for r in bundle.revs('sort(bundle())')] | ||||
| # new bookmark | # new bookmark | ||||
| if oldnode is None: | if oldnode is None: | ||||
| return revs | return revs | ||||
| logger = partial(ui.log, 'infinitepush', user=username, | logger = partial(ui.log, 'infinitepush', user=username, | ||||
| requestid=requestid, hostname=hostname, | requestid=requestid, hostname=hostname, | ||||
| reponame=ui.config('infinitepush', 'reponame')) | reponame=ui.config('infinitepush', 'reponame')) | ||||
| op.records.add('infinitepushlogger', logger) | op.records.add('infinitepushlogger', logger) | ||||
| else: | else: | ||||
| logger = logger[0] | logger = logger[0] | ||||
| return logger | return logger | ||||
| @bundle2.parthandler(scratchbranchparttype, | def storebundle(op, params, bundlefile): | ||||
| ('bookmark', 'bookprevnode' 'create', 'force', | |||||
| 'pushbackbookmarks', 'cgversion')) | |||||
| def bundle2scratchbranch(op, part): | |||||
| '''unbundle a bundle2 part containing a changegroup to store''' | |||||
| log = _getorcreateinfinitepushlogger(op) | log = _getorcreateinfinitepushlogger(op) | ||||
| parthandlerstart = time.time() | parthandlerstart = time.time() | ||||
| log(scratchbranchparttype, eventtype='start') | log(scratchbranchparttype, eventtype='start') | ||||
| params = part.params | |||||
| index = op.repo.bundlestore.index | index = op.repo.bundlestore.index | ||||
| store = op.repo.bundlestore.store | store = op.repo.bundlestore.store | ||||
| op.records.add(scratchbranchparttype + '_skippushkey', True) | op.records.add(scratchbranchparttype + '_skippushkey', True) | ||||
| bundlefile = None | |||||
| bundle = None | bundle = None | ||||
| try: # guards bundle | |||||
| try: # guards bundlefile | |||||
| cgversion = params.get('cgversion', '01') | |||||
| bundlefile = _makebundlefile(op.repo.ui, part, cgversion) | |||||
| bundlepath = "bundle:%s+%s" % (op.repo.root, bundlefile) | bundlepath = "bundle:%s+%s" % (op.repo.root, bundlefile) | ||||
| bundle = repository(op.repo.ui, bundlepath) | bundle = repository(op.repo.ui, bundlepath) | ||||
| bookmark = params.get('bookmark') | bookmark = params.get('bookmark') | ||||
| bookprevnode = params.get('bookprevnode', '') | bookprevnode = params.get('bookprevnode', '') | ||||
| create = params.get('create') | create = params.get('create') | ||||
| force = params.get('force') | force = params.get('force') | ||||
| _asyncsavemetadata(op.repo.root, | _asyncsavemetadata(op.repo.root, | ||||
| [ctx.hex() for ctx in nodesctx]) | [ctx.hex() for ctx in nodesctx]) | ||||
| except Exception as e: | except Exception as e: | ||||
| log(scratchbranchparttype, eventtype='failure', | log(scratchbranchparttype, eventtype='failure', | ||||
| elapsedms=(time.time() - parthandlerstart) * 1000, | elapsedms=(time.time() - parthandlerstart) * 1000, | ||||
| errormsg=str(e)) | errormsg=str(e)) | ||||
| raise | raise | ||||
| finally: | finally: | ||||
| if bundle: | |||||
| bundle.close() | |||||
| @bundle2.parthandler(scratchbranchparttype, | |||||
| ('bookmark', 'bookprevnode' 'create', 'force', | |||||
| 'pushbackbookmarks', 'cgversion')) | |||||
| def bundle2scratchbranch(op, part): | |||||
| '''unbundle a bundle2 part containing a changegroup to store''' | |||||
| bundler = bundle2.bundle20(op.repo.ui) | |||||
| cgversion = part.params.get('cgversion', '01') | |||||
| cgpart = bundle2.bundlepart('changegroup', data=part.read()) | |||||
| cgpart.addparam('version', cgversion) | |||||
| bundler.addpart(cgpart) | |||||
| buf = util.chunkbuffer(bundler.getchunks()) | |||||
| fd, bundlefile = tempfile.mkstemp() | |||||
| try: | |||||
| try: | |||||
| fp = os.fdopen(fd, 'wb') | |||||
| fp.write(buf.read()) | |||||
| finally: | |||||
| fp.close() | |||||
| storebundle(op, part.params, bundlefile) | |||||
| finally: | |||||
| try: | try: | ||||
| if bundlefile: | |||||
| os.unlink(bundlefile) | os.unlink(bundlefile) | ||||
| except OSError as e: | except OSError as e: | ||||
| if e.errno != errno.ENOENT: | if e.errno != errno.ENOENT: | ||||
| raise | raise | ||||
| if bundle: | |||||
| bundle.close() | |||||
| return 1 | return 1 | ||||
| @bundle2.parthandler(scratchbookmarksparttype) | @bundle2.parthandler(scratchbookmarksparttype) | ||||
| def bundle2scratchbookmarks(op, part): | def bundle2scratchbookmarks(op, part): | ||||
| '''Handler deletes bookmarks first then adds new bookmarks. | '''Handler deletes bookmarks first then adds new bookmarks. | ||||
| ''' | ''' | ||||
| index = op.repo.bundlestore.index | index = op.repo.bundlestore.index | ||||