This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11791

dirstate: stop gathering parentfiledata in update_file
ClosedPublic

Authored by marmoute on Nov 24 2021, 6:12 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGf838f5bca038: dirstate: stop gathering parentfiledata in update_file
Summary

Gathering information here assume that they are valid cache information for a
clean file. It is true most of the time, but not garanteed.

Accurate data can still be explicitly provided.

We drop the spontaneous and will let the next hg status call record actual information.

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.Nov 24 2021, 6:12 AM
Alphare accepted this revision.Nov 24 2021, 8:40 AM
This revision is now accepted and ready to land.Nov 24 2021, 8:40 AM
marmoute updated this revision to Diff 31228.Nov 30 2021, 6:54 PM
marmoute added a commit: rHGf838f5bca038: dirstate: stop gathering parentfiledata in update_file.Dec 1 2021, 10:22 AM
Closed by commit rHGf838f5bca038: dirstate: stop gathering parentfiledata in update_file (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 31253

mercurial/dirstate.py

""" """
# note: I do not think we need to double check name clash here since we # note: I do not think we need to double check name clash here since we
# are in a update/merge case that should already have taken care of # are in a update/merge case that should already have taken care of
# this. The test agrees # this. The test agrees
self._dirty = True self._dirty = True
need_parent_file_data = (
not possibly_dirty and not p2_info and wc_tracked and p1_tracked
)
if need_parent_file_data and parentfiledata is None:
parentfiledata = self._get_filedata(filename)
self._map.reset_state( self._map.reset_state(
filename, filename,
wc_tracked, wc_tracked,
p1_tracked, p1_tracked,
p2_info=p2_info, p2_info=p2_info,
has_meaningful_mtime=not possibly_dirty, has_meaningful_mtime=not possibly_dirty,
parentfiledata=parentfiledata, parentfiledata=parentfiledata,
) )

tests/test-backout.t

$ hg add c $ hg add c
$ hg remove b $ hg remove b
$ hg commit -d '5 0' -m 'prepare for subsequent backout' $ hg commit -d '5 0' -m 'prepare for subsequent backout'
$ touch -t 200001010000 c $ touch -t 200001010000 c
$ hg status -A $ hg status -A
C c C c
$ hg debugstate --no-dates $ hg debugstate --no-dates
n 644 12 set c (no-rhg !) n 644 12 set c (no-rhg !)
n 644 12 unset c (?) n 0 -1 unset c (rhg known-bad-output !)
n 644 12 set c (?)
$ hg backout -d '6 0' -m 'to be rollback-ed soon' -r . $ hg backout -d '6 0' -m 'to be rollback-ed soon' -r .
removing c removing c
adding b adding b
changeset 6:4bfec048029d backs out changeset 5:fac0b729a654 changeset 6:4bfec048029d backs out changeset 5:fac0b729a654
$ hg rollback -q $ hg rollback -q
$ hg status -A $ hg status -A
A b A b
R c R c

tests/test-dirstate-race2.t

#testcases dirstate-v1 dirstate-v2 #testcases dirstate-v1 dirstate-v2
#if dirstate-v2 #if dirstate-v2
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [format] > [format]
> exp-rc-dirstate-v2=1 > exp-rc-dirstate-v2=1
> [storage] > [storage]
> dirstate-v2.slow-path=allow > dirstate-v2.slow-path=allow
> EOF > EOF
#endif #endif
TODO: fix rhg bugs that make this test fail when status is enabled
$ unset RHG_STATUS
Checking the size/permissions/file-type of files stored in the Checking the size/permissions/file-type of files stored in the
dirstate after an update where the files are changed concurrently dirstate after an update where the files are changed concurrently
outside of hg's control. outside of hg's control.
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ echo a > a $ echo a > a
$ hg commit -qAm _ $ hg commit -qAm _

tests/test-largefiles-update.t

Wait to make sure we get a tick so the mtime of the largefiles become valid. Wait to make sure we get a tick so the mtime of the largefiles become valid.
$ sleep 1 $ sleep 1
A linear merge will update standins before performing the actual merge. It will A linear merge will update standins before performing the actual merge. It will
do a lfdirstate status walk and find 'unset'/'unsure' files, hash them, and do a lfdirstate status walk and find 'unset'/'unsure' files, hash them, and
update the corresponding standins. update the corresponding standins.
Verify that it actually marks the clean files as clean in lfdirstate so Verify that it actually marks the clean files as clean in lfdirstate so
we don't have to hash them again next time we update. we don't have to hash them again next time we update.
# note:
# We do this less agressively now, to avoid race condition, however the
# cache
# is properly set after the next status
#
# The "changed" output is marked as missing-correct-output/known-bad-output
# for clarify
$ hg up $ hg up
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to "f74e50bd9e55: #2" updated to "f74e50bd9e55: #2"
1 other heads for branch "default" 1 other heads for branch "default"
$ hg debugdirstate --large --nodate $ hg debugdirstate --large --nodate
n 644 7 set large1 (missing-correct-output !)
n 644 13 set large2 (missing-correct-output !)
n 0 -1 unset large1 (known-bad-output !)
n 0 -1 unset large2 (known-bad-output !)
$ sleep 1 # so that mtime are not ambiguous
$ hg status
$ hg debugdirstate --large --nodate
n 644 7 set large1 n 644 7 set large1
n 644 13 set large2 n 644 13 set large2
Test that lfdirstate keeps track of last modification of largefiles and Test that lfdirstate keeps track of last modification of largefiles and
prevents unnecessary hashing of content - also after linear/noop update prevents unnecessary hashing of content - also after linear/noop update
(XXX Since there is a possible race during update, we only do this after the next
status call, this is slower, but more correct)
$ sleep 1 $ sleep 1
$ hg st $ hg st
$ hg debugdirstate --large --nodate $ hg debugdirstate --large --nodate
n 644 7 set large1 n 644 7 set large1
n 644 13 set large2 n 644 13 set large2
$ hg up $ hg up
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to "f74e50bd9e55: #2" updated to "f74e50bd9e55: #2"
1 other heads for branch "default" 1 other heads for branch "default"
$ hg debugdirstate --large --nodate $ hg debugdirstate --large --nodate
n 644 7 set large1 (missing-correct-output !)
n 644 13 set large2 (missing-correct-output !)
n 0 -1 unset large1 (known-bad-output !)
n 0 -1 unset large2 (known-bad-output !)
$ sleep 1 # so that mtime are not ambiguous
$ hg status
$ hg debugdirstate --large --nodate
n 644 7 set large1 n 644 7 set large1
n 644 13 set large2 n 644 13 set large2
Test that "hg merge" updates largefiles from "other" correctly Test that "hg merge" updates largefiles from "other" correctly
(getting largefiles from "other" normally) (getting largefiles from "other" normally)
$ hg status -A large1 $ hg status -A large1

tests/test-transplant.t

> fakepatchtime = ! > fakepatchtime = !
> [extensions] > [extensions]
> abort = ! > abort = !
> EOF > EOF
$ cat r1 $ cat r1
Y1 Y1
$ hg debugstate | grep ' r1$' $ hg debugstate | grep ' r1$'
n 644 3 unset r1 n 0 -1 unset r1
$ hg status -A r1 $ hg status -A r1
M r1 M r1
Test that rollback by unexpected failure after transplanting the first Test that rollback by unexpected failure after transplanting the first
revision restores dirstate correctly. revision restores dirstate correctly.
$ hg rollback -q $ hg rollback -q
$ rm -f abort $ rm -f abort