This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8833

sparse: add comment for an if condition which I tried to refactor
ClosedPublic

Authored by pulkit on Jul 25 2020, 6:03 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG6a8eafaeff3b: sparse: add comment for an if condition which I tried to refactor
Summary

I tried to refactor this if condition and make it part of the if-else above but
tests failed. I decided to add a comment about the check we are doing and why
it's a separate if.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/sparse.py (6 lines)

Diff 22216

mercurial/sparse.py

if type != mergestatemod.ACTION_KEEP: if type != mergestatemod.ACTION_KEEP:
temporaryfiles.append(file) temporaryfiles.append(file)
prunedactions[file] = action prunedactions[file] = action
elif type == mergestatemod.ACTION_FORGET: elif type == mergestatemod.ACTION_FORGET:
prunedactions[file] = action prunedactions[file] = action
elif file in wctx: elif file in wctx:
prunedactions[file] = (mergestatemod.ACTION_REMOVE, args, msg) prunedactions[file] = (mergestatemod.ACTION_REMOVE, args, msg)
# in case or rename on one side, it is possible that f1 might not
# be present in sparse checkout we should include it
# TODO: should we do the same for f2?
# exists as a separate check because file can be in sparse and hence
# if we try to club this condition in above `elif type == ACTION_MERGE`
# it won't be triggered
if branchmerge and type == mergestatemod.ACTION_MERGE: if branchmerge and type == mergestatemod.ACTION_MERGE:
f1, f2, fa, move, anc = args f1, f2, fa, move, anc = args
if not sparsematch(f1): if not sparsematch(f1):
temporaryfiles.append(f1) temporaryfiles.append(f1)
if len(temporaryfiles) > 0: if len(temporaryfiles) > 0:
repo.ui.status( repo.ui.status(
_( _(