flags: read flag from dirstate/disk for workingcopyctx (issue5743) In 491855ea9d62, various piece of code are moved from committablectx to workingctx. The reason given is "These read from the dirstate, so they shouldn't be used in other subclasses." At least for `flags` this change introduce a bug, because the value flags end up being read from `_manifest` disregarding the actual state in the working copy (ie: on disk). When merging exec flag change with renames, this means a new files (the local content, renamed) is properly written on disk, with the right flags, but the flags part is later ignored when actually reading flags during merge. It is not clear to me why the `flags` function was moved, because the code does not actually hit the dirstate (the reason given in the changeset description). So I am moving it back to were it comes from and we use a simpler version of that code (that hit the dirstate everytime) in workingcopyctx. This fix the last know bug with merging rename and executable byte changes. Other similar bug might be lurking in 491855ea9d62, but I have not investigated them. Differential Revision: https://phab.mercurial-scm.org/D8534

     1

Checking the size/permissions/file-type of files stored in the

     2

dirstate after an update where the files are changed concurrently

     3

outside of hg's control.

     4

     5

  $ hg init repo

     6

  $ cd repo

     7

  $ echo a > a

     8

  $ hg commit -qAm _

     9

  $ echo aa > a

    10

  $ hg commit -m _

    11

    12

  $ hg debugdirstate --no-dates

    13

  n 644          3 (set  |unset)               a (re)

    14

    15

  $ cat >> $TESTTMP/dirstaterace.py << EOF

    16

  > from mercurial import (

    17

  >     extensions,

    18

  >     merge,

    19

  > )

    20

  > def extsetup(ui):

    21

  >     extensions.wrapfunction(merge, 'applyupdates', wrap)

    22

  > def wrap(orig, *args, **kwargs):

    23

  >     res = orig(*args, **kwargs)

    24

  >     with open("a", "w"):

    25

  >         pass # just truncate the file

    26

  >     return res

    27

  > EOF

    28

    29

Do an update where file 'a' is changed between hg writing it to disk

    30

and hg writing the dirstate. The dirstate is correct nonetheless, and

    31

so hg status correctly shows a as clean.

    32

    33

  $ hg up -r 0 --config extensions.race=$TESTTMP/dirstaterace.py

    34

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    35

  $ hg debugdirstate --no-dates

    36

  n 644          2 (set  |unset)               a (re)

    37

  $ echo a > a; hg status; hg diff