comparison mercurial/node.py @ 30361:1070df141718

dirstate: change added/modified placeholder hash length to 20 bytes Previously the added/modified placeholder hash for manifests generated from the dirstate was a 21byte long string consisting of the p1 file hash plus a single character to indicate an add or a modify. Normal hashes are only 20 bytes long. This makes it complicated to implement more efficient manifest implementations which rely on the hashes being fixed length. Let's change this hash to just be 20 bytes long, and rely on the astronomical improbability of an actual hash being these 20 bytes (just like we rely on no hash every being the nullid). This changes the possible behavior slightly in that the hash for all added/modified entries in the dirstate manifest will now be the same (so simple node comparisons would say they are equal), but we should never be doing simple node comparisons on these nodes even with the old hashes, because they did not accurately represent the content (i.e. two files based off the same p1 file node, with different working copy contents would have the same hash (even with the appended character) in the old scheme too, so we couldn't depend on the hashes period).
author Durham Goode <durham@fb.com>
date Thu, 10 Nov 2016 02:19:16 -0800
parents 0298a07f64d9
children bd872f64a8ba
comparison
equal deleted inserted replaced
30360:0298a07f64d9 30361:1070df141718
18 nullhex = hex(nullid) 18 nullhex = hex(nullid)
19 19
20 # Phony node value to stand-in for new files in some uses of 20 # Phony node value to stand-in for new files in some uses of
21 # manifests. 21 # manifests.
22 newnodeid = '!' * 20 22 newnodeid = '!' * 20
23 addednodeid = ('0' * 15) + 'added'
24 modifiednodeid = ('0' * 12) + 'modified'
23 25
24 wdirnodes = set((newnodeid,)) 26 wdirnodes = set((newnodeid, addednodeid, modifiednodeid))
25 27
26 # pseudo identifiers for working directory 28 # pseudo identifiers for working directory
27 # (they are experimental, so don't add too many dependencies on them) 29 # (they are experimental, so don't add too many dependencies on them)
28 wdirrev = 0x7fffffff 30 wdirrev = 0x7fffffff
29 wdirid = b"\xff" * 20 31 wdirid = b"\xff" * 20