This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8880

mergeresult: implement a len() function and use it
ClosedPublic

Authored by pulkit on Aug 5 2020, 4:52 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG72b8c082676b: mergeresult: implement a len() function and use it
Summary

In next patch we will start yielding from getactions() instead of building and
returning a list. Hence we can no longer rely on that for getting us a length.

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.Aug 5 2020, 4:52 AM
pulkit updated this revision to Diff 22302.Aug 6 2020, 7:14 AM
indygreg accepted this revision.Aug 8 2020, 12:23 PM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
mercurial/merge.py
1423

I should read your full series before leaving comments that are addressed in the next patch :)

This revision is now accepted and ready to land.Aug 8 2020, 12:23 PM
pulkit added a commit: rHG72b8c082676b: mergeresult: implement a len() function and use it.Aug 8 2020, 12:55 PM
Closed by commit rHG72b8c082676b: mergeresult: implement a len() function and use it (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (28 lines)

Diff 22338

mercurial/merge.py

res.append((f, args, msg)) res.append((f, args, msg))
else: else:
for f, (args, msg) in pycompat.iteritems( for f, (args, msg) in pycompat.iteritems(
self._actionmapping[a] self._actionmapping[a]
): ):
res.append((f, args, msg)) res.append((f, args, msg))
return res return res
def len(self, actions=None):
""" returns number of files which needs actions
if actions is passed, total of number of files in that action
only is returned """
if actions is None:
return len(self._filemapping)
return sum(len(self._actionmapping[a]) for a in actions)
@property @property
def actions(self): def actions(self):
return self._filemapping return self._filemapping
@property @property
def diverge(self): def diverge(self):
return self._diverge return self._diverge
# remove renamed files after safely stored # remove renamed files after safely stored
for f in moves: for f in moves:
if wctx[f].lexists(): if wctx[f].lexists():
repo.ui.debug(b"removing %s\n" % f) repo.ui.debug(b"removing %s\n" % f)
wctx[f].audit() wctx[f].audit()
wctx[f].remove() wctx[f].remove()
numupdates = len(mresult.actions) - len( numupdates = mresult.len() - mresult.len((mergestatemod.ACTION_KEEP,))
indygregUnsubmitted
Not Done

I should read your full series before leaving comments that are addressed in the next patch :)

indygreg: I should read your full series before leaving comments that are addressed in the next patch :)
mresult._actionmapping[mergestatemod.ACTION_KEEP]
)
progress = repo.ui.makeprogress( progress = repo.ui.makeprogress(
_(b'updating'), unit=_(b'files'), total=numupdates _(b'updating'), unit=_(b'files'), total=numupdates
) )
if b'.hgsubstate' in mresult._actionmapping[mergestatemod.ACTION_REMOVE]: if b'.hgsubstate' in mresult._actionmapping[mergestatemod.ACTION_REMOVE]:
subrepoutil.submerge(repo, wctx, mctx, wctx, overwrite, labels) subrepoutil.submerge(repo, wctx, mctx, wctx, overwrite, labels)
# record path conflicts # record path conflicts
repo.ui, repo.ui,
cost, cost,
batchremove, batchremove,
(repo, wctx), (repo, wctx),
mresult.getactions([mergestatemod.ACTION_REMOVE], sort=True), mresult.getactions([mergestatemod.ACTION_REMOVE], sort=True),
) )
for i, item in prog: for i, item in prog:
progress.increment(step=i, item=item) progress.increment(step=i, item=item)
removed = len(mresult._actionmapping[mergestatemod.ACTION_REMOVE]) removed = mresult.len((mergestatemod.ACTION_REMOVE,))
# resolve path conflicts (must come before getting) # resolve path conflicts (must come before getting)
for f, args, msg in mresult.getactions( for f, args, msg in mresult.getactions(
[mergestatemod.ACTION_PATH_CONFLICT_RESOLVE], sort=True [mergestatemod.ACTION_PATH_CONFLICT_RESOLVE], sort=True
): ):
repo.ui.debug(b" %s: %s -> pr\n" % (f, msg)) repo.ui.debug(b" %s: %s -> pr\n" % (f, msg))
(f0, origf0) = args (f0, origf0) = args
if wctx[f0].lexists(): if wctx[f0].lexists():
) )
getfiledata = {} getfiledata = {}
for final, res in prog: for final, res in prog:
if final: if final:
getfiledata = res getfiledata = res
else: else:
i, item = res i, item = res
progress.increment(step=i, item=item) progress.increment(step=i, item=item)
updated = len(mresult._actionmapping[mergestatemod.ACTION_GET]) updated = mresult.len((mergestatemod.ACTION_GET,))
if b'.hgsubstate' in mresult._actionmapping[mergestatemod.ACTION_GET]: if b'.hgsubstate' in mresult._actionmapping[mergestatemod.ACTION_GET]:
subrepoutil.submerge(repo, wctx, mctx, wctx, overwrite, labels) subrepoutil.submerge(repo, wctx, mctx, wctx, overwrite, labels)
# forget (manifest only, just log it) (must come first) # forget (manifest only, just log it) (must come first)
for f, args, msg in mresult.getactions( for f, args, msg in mresult.getactions(
(mergestatemod.ACTION_FORGET,), sort=True (mergestatemod.ACTION_FORGET,), sort=True
): ):
mfiles.difference_update(a[0] for a in acts) mfiles.difference_update(a[0] for a in acts)
for a in mresult.getactions([mergestatemod.ACTION_MERGE]): for a in mresult.getactions([mergestatemod.ACTION_MERGE]):
if a[0] not in mfiles: if a[0] not in mfiles:
mresult.removefile(a[0]) mresult.removefile(a[0])
progress.complete() progress.complete()
assert len(getfiledata) == ( assert len(getfiledata) == (
len(mresult._actionmapping[mergestatemod.ACTION_GET]) mresult.len((mergestatemod.ACTION_GET,)) if wantfiledata else 0
if wantfiledata
else 0
) )
return updateresult(updated, merged, removed, unresolved), getfiledata return updateresult(updated, merged, removed, unresolved), getfiledata
def _advertisefsmonitor(repo, num_gets, p1node): def _advertisefsmonitor(repo, num_gets, p1node):
# Advertise fsmonitor when its presence could be useful. # Advertise fsmonitor when its presence could be useful.
# #
# We only advertise when performing an update from an empty working # We only advertise when performing an update from an empty working
# the dirstate. # the dirstate.
always = matcher is None or matcher.always() always = matcher is None or matcher.always()
updatedirstate = updatedirstate and always and not wc.isinmemory() updatedirstate = updatedirstate and always and not wc.isinmemory()
if updatedirstate: if updatedirstate:
repo.hook(b'preupdate', throw=True, parent1=xp1, parent2=xp2) repo.hook(b'preupdate', throw=True, parent1=xp1, parent2=xp2)
# note that we're in the middle of an update # note that we're in the middle of an update
repo.vfs.write(b'updatestate', p2.hex()) repo.vfs.write(b'updatestate', p2.hex())
# Convert to dictionary-of-lists format
actions = mresult.actionsdict
_advertisefsmonitor( _advertisefsmonitor(
repo, len(actions[mergestatemod.ACTION_GET]), p1.node() repo, mresult.len((mergestatemod.ACTION_GET,)), p1.node()
) )
wantfiledata = updatedirstate and not branchmerge wantfiledata = updatedirstate and not branchmerge
stats, getfiledata = applyupdates( stats, getfiledata = applyupdates(
repo, repo,
mresult, mresult,
wc, wc,
p2, p2,