This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2957

infinitepush: don't wrap bundle2.processparts while calling `hg unbundle`
ClosedPublic

Authored by pulkit on Mar 27 2018, 8:38 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGe5cd0ef5c362: infinitepush: don't wrap bundle2.processparts while calling `hg unbundle`
Summary

This patch adds dirty logic to check whether we are processing hg unbundle
instead of an hg incoming to prevent the wrapping of bundle2.processparts
function.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Mar 27 2018, 8:38 AM
indygreg requested changes to this revision.Mar 30 2018, 1:59 PM
indygreg added a subscriber: indygreg.

Can the op argument be used instead?

Also, given the hackiness of this, I'd feel much better if there were test coverage for hg unbundle continuing to work with this extension enabled.

This revision now requires changes to proceed.Mar 30 2018, 1:59 PM
indygreg accepted this revision.Mar 30 2018, 2:05 PM

The next patch adds test coverage. So I think this is fine. A follow-up to make this less hacky (if possible) would be appreciated, but isn't required.

This revision is now accepted and ready to land.Mar 30 2018, 2:05 PM
Closed by commit rHGe5cd0ef5c362: infinitepush: don't wrap bundle2.processparts while calling `hg unbundle` (authored by pulkit). · Explain WhyMar 30 2018, 3:53 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/infinitepush/__init__.py (7 lines)

Diff 7340

hgext/infinitepush/__init__.py

reponame=ui.config('infinitepush', reponame=ui.config('infinitepush',
'reponame')) 'reponame'))
op.records.add('infinitepushlogger', logger) op.records.add('infinitepushlogger', logger)
else: else:
logger = logger[0] logger = logger[0]
return logger return logger
def processparts(orig, repo, op, unbundler): def processparts(orig, repo, op, unbundler):
# make sure we don't wrap processparts in case of `hg unbundle`
tr = repo.currenttransaction()
if tr:
if tr.names[0].startswith('unbundle'):
return orig(repo, op, unbundler)
if unbundler.params.get('infinitepush') != 'True': if unbundler.params.get('infinitepush') != 'True':
return orig(repo, op, unbundler) return orig(repo, op, unbundler)
handleallparts = repo.ui.configbool('infinitepush', 'storeallparts') handleallparts = repo.ui.configbool('infinitepush', 'storeallparts')
bundler = bundle2.bundle20(repo.ui) bundler = bundle2.bundle20(repo.ui)
cgparams = None cgparams = None
with bundle2.partiterator(repo, op, unbundler) as parts: with bundle2.partiterator(repo, op, unbundler) as parts: