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

#!/usr/bin/env python

     2

     3

# Filter output by pyflakes to control which warnings we check

     4

     5

from __future__ import absolute_import, print_function

     6

     7

import re

     8

import sys

     9

    10

lines = []

    11

for line in sys.stdin:

    12

    # We blacklist tests that are too noisy for us

    13

    pats = [

    14

        r"undefined name 'WindowsError'",

    15

        r"redefinition of unused '[^']+' from line",

    16

        # for cffi, allow re-exports from pure.*

    17

        r"cffi/[^:]*:.*\bimport \*' used",

    18

        r"cffi/[^:]*:.*\*' imported but unused",

    19

    ]

    20

    21

    keep = True

    22

    for pat in pats:

    23

        if re.search(pat, line):

    24

            keep = False

    25

            break  # pattern matches

    26

    if keep:

    27

        fn = line.split(':', 1)[0]

    28

        f = open(fn)

    29

        data = f.read()

    30

        f.close()

    31

        if 'no-' 'check-code' in data:

    32

            continue

    33

        lines.append(line)

    34

    35

for line in lines:

    36

    sys.stdout.write(line)

    37

print()