transaction: use the standard transaction mechanism to backup branch Branch is a bit special : - It currently does not collaborate with the transaction (or any scoping) for writing (this is bad) - It can change without the lock being taken (it is protected by `wlock`) So we rely on the same mechanism as for the backup of the other dirstate file: - we only do a backup if we hold the wlock - we force a backup though the transaction Since "branch" write does not collaborate with the transaction, we cannot back it up "at the last minute" as we do for the dirstate. We have to back it up "upfront". Since we have a backup, the transaction is no longer doing its "quick_abort" and get noisy. Which is quite annoying. To work around this, and to avoid jumping in yet-another-rabbit-hole of "getting branch written properly", I am doing horrible things to the transaction in the meantime. We should be able to get this code go away during the next cycle. In the meantime, I prefer to take this small stop so that we stop abusing the "journal" and "undo" mechanism instead of the proper backup mechanism of the transaction. Also note that this change regress the warning message for the legacy fallback introduced in 2008 when issue902 got fixed in dd5a501cb97f (Mercurial 1.0). I feel like this is fine as issue 902 remains fixed, and this would only affect people deploying a mix of 15 year old Mercurial and modern mercurial, and using branch and rollback extensively.

     1

import __builtin__

     2

import os

     3

from mercurial import util

     4

     5

     6

def lowerwrap(scope, funcname):

     7

    f = getattr(scope, funcname)

     8

     9

    def wrap(fname, *args, **kwargs):

    10

        d, base = os.path.split(fname)

    11

        try:

    12

            files = os.listdir(d or '.')

    13

        except OSError:

    14

            files = []

    15

        if base in files:

    16

            return f(fname, *args, **kwargs)

    17

        for fn in files:

    18

            if fn.lower() == base.lower():

    19

                return f(os.path.join(d, fn), *args, **kwargs)

    20

        return f(fname, *args, **kwargs)

    21

    22

    scope.__dict__[funcname] = wrap

    23

    24

    25

def normcase(path):

    26

    return path.lower()

    27

    28

    29

os.path.normcase = normcase

    30

    31

for f in 'file open'.split():

    32

    lowerwrap(__builtin__, f)

    33

    34

for f in "chmod chown open lstat stat remove unlink".split():

    35

    lowerwrap(os, f)

    36

    37

for f in "exists lexists".split():

    38

    lowerwrap(os.path, f)

    39

    40

lowerwrap(util, 'posixfile')