( )⚙ D11172 record: use `update_file` instead of `normallookup`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11172

record: use `update_file` instead of `normallookup`
ClosedPublic

Authored by marmoute on Jul 19 2021, 10:09 AM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHGcc438f793b98: record: use `update_file` instead of `normallookup`
Summary

We are cheating a bit to enforce we are in a pending change context. This will
have to be cleaned up later.

The end goal is reached, we are now using the newer, more semantic API.

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

marmoute created this revision.Jul 19 2021, 10:09 AM
Alphare added a subscriber: Alphare.Jul 19 2021, 10:33 AM
Alphare added inline comments.
mercurial/dirstate.py
510 ↗(On Diff #29450)

This seems unrelated?

marmoute added inline comments.Jul 19 2021, 10:42 AM
mercurial/dirstate.py
510 ↗(On Diff #29450)

This is the remain of some older draft that is clinging to life, it should be dropped. (update coming)

marmoute updated this revision to Diff 29476.Jul 19 2021, 10:54 AM
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 29517.Jul 19 2021, 4:04 PM

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

pulkit accepted this revision.Jul 20 2021, 3:45 PM
marmoute added a commit: rHGcc438f793b98: record: use `update_file` instead of `normallookup`.Jul 20 2021, 4:39 PM
Closed by commit rHGcc438f793b98: record: use `update_file` instead of `normallookup` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (14 lines)

Diff 29673

mercurial/cmdutil.py

dirstate = repo.dirstate dirstate = repo.dirstate
for realname, tmpname in pycompat.iteritems(backups): for realname, tmpname in pycompat.iteritems(backups):
ui.debug(b'restoring %r to %r\n' % (tmpname, realname)) ui.debug(b'restoring %r to %r\n' % (tmpname, realname))
if dirstate[realname] == b'n': if dirstate[realname] == b'n':
# without normallookup, restoring timestamp # without normallookup, restoring timestamp
# may cause partially committed files # may cause partially committed files
# to be treated as unmodified # to be treated as unmodified
dirstate.normallookup(realname)
# XXX-PENDINGCHANGE: We should clarify the context in
# which this function is called to make sure it
# already called within a `pendingchange`, However we
# are taking a shortcut here in order to be able to
# quickly deprecated the older API.
with dirstate.parentchange():
dirstate.update_file(
realname,
p1_tracked=True,
wc_tracked=True,
possibly_dirty=True,
)
# copystat=True here and above are a hack to trick any # copystat=True here and above are a hack to trick any
# editors that have f open that we haven't modified them. # editors that have f open that we haven't modified them.
# #
# Also note that this racy as an editor could notice the # Also note that this racy as an editor could notice the
# file's mtime before we've finished writing it. # file's mtime before we've finished writing it.
util.copyfile(tmpname, repo.wjoin(realname), copystat=True) util.copyfile(tmpname, repo.wjoin(realname), copystat=True)
os.unlink(tmpname) os.unlink(tmpname)