comparison mercurial/metadata.py @ 46618:dde86beca388

copies: tests and fix parallel computation of changed file information

The code was mixing variable name and misbehaving in some case. This changeset
fix it and also add a tests to validate it does not regress. Without the fix,
the parallel-upgrade misbehavior in random ways.

Differential Revision: https://phab.mercurial-scm.org/D10084

46617:87f8b3add56b

    def sidedata_companion(revlog, rev):
        data = {}, False
        if util.safehasattr(revlog, b'filteredrevs'):  # this is a changelog
            # Is the data previously shelved ?
            sidedata = staging.pop(rev, None)
            if sidedata is None:
                # look at the queued result until we find the one we are lookig
                # for (shelve the other ones)
                r, data = sidedataq.get()
                while r != rev:
                    staging[r] = data
                    r, sidedata = sidedataq.get()
            tokens.release()
        sidedata, has_copies_info = data
        new_flag = 0
        if has_copies_info:
            new_flag = sidedataflag.REVIDX_HASCOPIESINFO

46618:dde86beca388

    def sidedata_companion(revlog, rev):
        data = {}, False
        if util.safehasattr(revlog, b'filteredrevs'):  # this is a changelog
            # Is the data previously shelved ?
            data = staging.pop(rev, None)
            if data is None:
                # look at the queued result until we find the one we are lookig
                # for (shelve the other ones)
                r, data = sidedataq.get()
                while r != rev:
                    staging[r] = data
                    r, data = sidedataq.get()
            tokens.release()
        sidedata, has_copies_info = data
        new_flag = 0
        if has_copies_info:
            new_flag = sidedataflag.REVIDX_HASCOPIESINFO