( )⚙ D8883 applyupdates: simplfy calculation of number of updated files

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8883

applyupdates: simplfy calculation of number of updated files
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGe335936cd4e1: applyupdates: simplfy calculation of number of updated files
Summary

Instead of increasing the updated variable each time in a loop, let's use the
mergeresult object API to calculate the updated value in one call.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (13 lines)

Diff 22304

mercurial/merge.py

) )
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 = 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
): ):
): ):
repo.ui.debug(b" %s: %s -> dm\n" % (f, msg)) repo.ui.debug(b" %s: %s -> dm\n" % (f, msg))
progress.increment(item=f) progress.increment(item=f)
f0, flags = args f0, flags = args
repo.ui.note(_(b"moving %s to %s\n") % (f0, f)) repo.ui.note(_(b"moving %s to %s\n") % (f0, f))
wctx[f].audit() wctx[f].audit()
wctx[f].write(wctx.filectx(f0).data(), flags) wctx[f].write(wctx.filectx(f0).data(), flags)
wctx[f0].remove() wctx[f0].remove()
updated += 1
# local directory rename, get # local directory rename, get
for f, args, msg in mresult.getactions( for f, args, msg in mresult.getactions(
(mergestatemod.ACTION_LOCAL_DIR_RENAME_GET,), sort=True (mergestatemod.ACTION_LOCAL_DIR_RENAME_GET,), sort=True
): ):
repo.ui.debug(b" %s: %s -> dg\n" % (f, msg)) repo.ui.debug(b" %s: %s -> dg\n" % (f, msg))
progress.increment(item=f) progress.increment(item=f)
f0, flags = args f0, flags = args
repo.ui.note(_(b"getting %s to %s\n") % (f0, f)) repo.ui.note(_(b"getting %s to %s\n") % (f0, f))
wctx[f].write(mctx.filectx(f0).data(), flags) wctx[f].write(mctx.filectx(f0).data(), flags)
updated += 1
# exec # exec
for f, args, msg in mresult.getactions( for f, args, msg in mresult.getactions(
(mergestatemod.ACTION_EXEC,), sort=True (mergestatemod.ACTION_EXEC,), sort=True
): ):
repo.ui.debug(b" %s: %s -> e\n" % (f, msg)) repo.ui.debug(b" %s: %s -> e\n" % (f, msg))
progress.increment(item=f) progress.increment(item=f)
(flags,) = args (flags,) = args
wctx[f].audit() wctx[f].audit()
wctx[f].setflags(b'l' in flags, b'x' in flags) wctx[f].setflags(b'l' in flags, b'x' in flags)
updated += 1
# these actions updates the file
updated = mresult.len(
(
mergestatemod.ACTION_GET,
mergestatemod.ACTION_EXEC,
mergestatemod.ACTION_LOCAL_DIR_RENAME_GET,
mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,
)
)
# the ordering is important here -- ms.mergedriver will raise if the merge # the ordering is important here -- ms.mergedriver will raise if the merge
# driver has changed, and we want to be able to bypass it when overwrite is # driver has changed, and we want to be able to bypass it when overwrite is
# True # True
usemergedriver = not overwrite and mergeactions and ms.mergedriver usemergedriver = not overwrite and mergeactions and ms.mergedriver
if usemergedriver: if usemergedriver:
if wctx.isinmemory(): if wctx.isinmemory():
raise error.InMemoryMergeConflictsError( raise error.InMemoryMergeConflictsError(