This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6437

narrow: refactor code around widening complicated by previous patch
ClosedPublic

Authored by pulkit on May 22 2019, 5:47 PM.

Details

Reviewers
durin42
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG8381b7067f17: narrow: refactor code around widening complicated by previous patch
Summary

Previous patch while adding support for using narrow_widen wireproto command,
complicated the code a bit. This patch refactors that.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.May 22 2019, 5:47 PM
pulkit updated this revision to Diff 15272.May 28 2019, 9:42 AM
pulkit updated this revision to Diff 15335.Jun 4 2019, 11:23 AM
martinvonz added inline comments.Jun 4 2019, 1:36 PM
hgext/narrow/narrowcommands.py
281

nit: looks like this can be deleted

282

nit: looks like these can be moved to before line 294

pulkit updated this revision to Diff 15337.Jun 4 2019, 1:52 PM
Closed by commit rHG8381b7067f17: narrow: refactor code around widening complicated by previous patch (authored by pulkit). · Explain WhyJun 4 2019, 1:57 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/narrowcommands.py (55 lines)

Diff 15339

hgext/narrow/narrowcommands.py

# define a function that narrowbundle2 can call after creating the # define a function that narrowbundle2 can call after creating the
# backup bundle, but before applying the bundle from the server # backup bundle, but before applying the bundle from the server
def setnewnarrowpats(): def setnewnarrowpats():
repo.setnarrowpats(newincludes, newexcludes) repo.setnarrowpats(newincludes, newexcludes)
repo.setnewnarrowpats = setnewnarrowpats repo.setnewnarrowpats = setnewnarrowpats
# silence the devel-warning of applying an empty changegroup # silence the devel-warning of applying an empty changegroup
overrides = {('devel', 'all-warnings'): False} overrides = {('devel', 'all-warnings'): False}
with ui.uninterruptible():
common = commoninc[0] common = commoninc[0]
martinvonzUnsubmitted
Not Done

nit: looks like this can be deleted

martinvonz: nit: looks like this can be deleted
with ui.uninterruptible():
martinvonzUnsubmitted
Not Done

nit: looks like these can be moved to before line 294

martinvonz: nit: looks like these can be moved to before line 294
if ellipsesremote: if ellipsesremote:
ds = repo.dirstate ds = repo.dirstate
p1, p2 = ds.p1(), ds.p2() p1, p2 = ds.p1(), ds.p2()
with ds.parentchange(): with ds.parentchange():
ds.setparents(node.nullid, node.nullid) ds.setparents(node.nullid, node.nullid)
with wrappedextraprepare:
if isoldellipses: if isoldellipses:
with wrappedextraprepare:
exchange.pull(repo, remote, heads=common) exchange.pull(repo, remote, heads=common)
else: else:
known = []
if ellipsesremote:
known = [node.hex(ctx.node()) for ctx in known = [node.hex(ctx.node()) for ctx in
repo.set('::%ln', common) repo.set('::%ln', common)
if ctx.node() != node.nullid] if ctx.node() != node.nullid]
with remote.commandexecutor() as e: with remote.commandexecutor() as e:
bundle = e.callcommand('narrow_widen', { bundle = e.callcommand('narrow_widen', {
'oldincludes': oldincludes, 'oldincludes': oldincludes,
'oldexcludes': oldexcludes, 'oldexcludes': oldexcludes,
'newincludes': newincludes, 'newincludes': newincludes,
'newexcludes': newexcludes, 'newexcludes': newexcludes,
'cgversion': '03', 'cgversion': '03',
'commonheads': common, 'commonheads': common,
'known': known, 'known': known,
'ellipses': True, 'ellipses': ellipsesremote,
}).result() }).result()
trmanager = exchange.transactionmanager(repo, 'widen',
remote.url()) trmanager = exchange.transactionmanager(repo, 'widen', remote.url())
with trmanager: with trmanager, repo.ui.configoverride(overrides, 'widen'):
op = bundle2.bundleoperation(repo, op = bundle2.bundleoperation(repo, trmanager.transaction,
trmanager.transaction, source='widen') source='widen')
# TODO: we should catch error.Abort here
bundle2.processbundle(repo, bundle, op=op) bundle2.processbundle(repo, bundle, op=op)
if ellipsesremote:
with ds.parentchange(): with ds.parentchange():
ds.setparents(p1, p2) ds.setparents(p1, p2)
else:
with remote.commandexecutor() as e:
bundle = e.callcommand('narrow_widen', {
'oldincludes': oldincludes,
'oldexcludes': oldexcludes,
'newincludes': newincludes,
'newexcludes': newexcludes,
'cgversion': '03',
'commonheads': common,
'known': [],
'ellipses': False,
}).result()
with repo.transaction('widening') as tr:
with repo.ui.configoverride(overrides, 'widen'):
tgetter = lambda: tr
bundle2.processbundle(repo, bundle,
transactiongetter=tgetter)
with repo.transaction('widening'): with repo.transaction('widening'):
repo.setnewnarrowpats() repo.setnewnarrowpats()
narrowspec.updateworkingcopy(repo) narrowspec.updateworkingcopy(repo)
narrowspec.copytoworkingcopy(repo) narrowspec.copytoworkingcopy(repo)
# TODO(rdamazio): Make new matcher format and update description # TODO(rdamazio): Make new matcher format and update description
@command('tracked', @command('tracked',