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

#require no-windows

     2

     3

  $ . "$TESTDIR/remotefilelog-library.sh"

     4

     5

  $ hg init master

     6

  $ cd master

     7

  $ cat >> .hg/hgrc <<EOF

     8

  > [remotefilelog]

     9

  > server=True

    10

  > EOF

    11

  $ echo x > x

    12

  $ hg commit -qAm x

    13

  $ echo y >> x

    14

  $ hg commit -qAm y

    15

  $ echo z >> x

    16

  $ hg commit -qAm z

    17

  $ hg update 1

    18

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

    19

  $ echo w >> x

    20

  $ hg commit -qAm w

    21

    22

  $ cd ..

    23

    24

Shallow clone and activate getflogheads testing extension

    25

    26

  $ hgcloneshallow ssh://user@dummy/master shallow --noupdate

    27

  streaming all changes

    28

  2 files to transfer, 908 bytes of data

    29

  transferred 908 bytes in * seconds (*/sec) (glob)

    30

  searching for changes

    31

  no changes found

    32

  $ cd shallow

    33

    34

  $ cat >> .hg/hgrc <<EOF

    35

  > [extensions]

    36

  > getflogheads=$TESTDIR/remotefilelog-getflogheads.py

    37

  > EOF

    38

    39

Get heads of a remotefilelog

    40

    41

  $ hg getflogheads x

    42

  2797809ca5e9c2f307d82b1345e832f655fb99a2

    43

  ca758b402ddc91e37e3113e1a97791b537e1b7bb

    44

    45

Get heads of a non-existing remotefilelog

    46

    47

  $ hg getflogheads y

    48

  EMPTY