( )⚙ D11141 largefile: rearrange conditionnal in `synclfdirstate`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11141

largefile: rearrange conditionnal in `synclfdirstate`
ClosedPublic

Authored by marmoute on Jul 19 2021, 6:41 AM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG034979d24c7b: largefile: rearrange conditionnal in `synclfdirstate`
Summary

We can liquidate the special case early, so do we.

Diff Detail

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

Event Timeline

marmoute created this revision.Jul 19 2021, 6:41 AM
pulkit added a subscriber: pulkit.Jul 19 2021, 10:51 AM
pulkit added inline comments.
hgext/largefiles/lfutil.py
557

Can state here be ??

marmoute added inline comments.Jul 19 2021, 10:57 AM
hgext/largefiles/lfutil.py
557

No, b'?' is never stored within entry.

Alphare accepted this revision.Jul 19 2021, 12:28 PM
This revision is now accepted and ready to land.Jul 19 2021, 12:28 PM
baymax updated this revision to Diff 29504.Jul 19 2021, 3:52 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit accepted this revision.Jul 20 2021, 3:31 PM
marmoute added a commit: rHG034979d24c7b: largefile: rearrange conditionnal in `synclfdirstate`.Jul 20 2021, 4:36 PM
Closed by commit rHG034979d24c7b: largefile: rearrange conditionnal in `synclfdirstate` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/largefiles/lfutil.py (30 lines)

Diff 29407

hgext/largefiles/lfutil.py

except IOError: except IOError:
hash = None hash = None
standins.append((lfile, hash)) standins.append((lfile, hash))
return standins return standins
def synclfdirstate(repo, lfdirstate, lfile, normallookup): def synclfdirstate(repo, lfdirstate, lfile, normallookup):
lfstandin = standin(lfile) lfstandin = standin(lfile)
if lfstandin in repo.dirstate: if lfstandin not in repo.dirstate:
lfdirstate.drop(lfile)
else:
stat = repo.dirstate._map[lfstandin] stat = repo.dirstate._map[lfstandin]
state, mtime = stat.state, stat.mtime state, mtime = stat.state, stat.mtime
pulkitUnsubmitted
Not Done

Can state here be ??

pulkit: Can `state` here be `?`?
marmouteAuthorUnsubmitted
Done

No, b'?' is never stored within entry.

marmoute: No, b'?' is never stored within entry.
else:
state, mtime = b'?', -1
if state == b'n': if state == b'n':
if normallookup or mtime < 0 or not repo.wvfs.exists(lfile): if normallookup or mtime < 0 or not repo.wvfs.exists(lfile):
# state 'n' doesn't ensure 'clean' in this case # state 'n' doesn't ensure 'clean' in this case
lfdirstate.normallookup(lfile) lfdirstate.normallookup(lfile)
else: else:
lfdirstate.normal(lfile) lfdirstate.normal(lfile)
elif state == b'm': elif state == b'm':
lfdirstate.normallookup(lfile) lfdirstate.normallookup(lfile)
elif state == b'r': elif state == b'r':
lfdirstate.remove(lfile) lfdirstate.remove(lfile)
elif state == b'a': elif state == b'a':
lfdirstate.add(lfile) lfdirstate.add(lfile)
elif state == b'?':
lfdirstate.drop(lfile)
def markcommitted(orig, ctx, node): def markcommitted(orig, ctx, node):
repo = ctx.repo() repo = ctx.repo()
lfdirstate = openlfdirstate(repo.ui, repo) lfdirstate = openlfdirstate(repo.ui, repo)
with lfdirstate.parentchange(): with lfdirstate.parentchange():
orig(node) orig(node)