comparison mercurial/obsolete.py @ 22394:813c6855b97f

obsolete: properly drop 'date' from metadata

Mistakes were made while resolving rebase conflicts in 4bc96685a40c. This led to
'date' being preserved in metadata when reading markers from a binary stream.

As a result, some known markers were seen as "new" when pulling. I noticed it
because a no-op pulls from main added about 600 duplicated markers to my
obsstore (for each pull).

I do not believe we need to perform any specific action to actively
de-duplicates existing obsstore. After this fix, duplicated markers will no be
propagated and the few affected repositories can probably deal with duplication (or
people can repull the obsstore from a clone).

As a side effect, we decode metadata only once, reducing the impact of the hack
in fm0 to store extra important data (parents and date).

22393:293930a1fa0a

                               'short, %d bytes expected, got %d')
                             % (mdsize, len(metadata)))
        off += mdsize
        meta = decodemeta(metadata)
        try:
            when, offset = decodemeta(metadata).pop('date', '0 0').split(' ')
            date = float(when), int(offset)
        except ValueError:
            date = (0., 0)
        parents = None
        if 'p2' in meta:

22394:813c6855b97f

                               'short, %d bytes expected, got %d')
                             % (mdsize, len(metadata)))
        off += mdsize
        meta = decodemeta(metadata)
        try:
            when, offset = meta.pop('date', '0 0').split(' ')
            date = float(when), int(offset)
        except ValueError:
            date = (0., 0)
        parents = None
        if 'p2' in meta: