This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4331

nodes: expand/comment the magic nodes so they are more easily searchable
ClosedPublic

Authored by spectral on Aug 17 2018, 6:32 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb623c7b23695: nodes: expand/comment the magic nodes so they are more easily searchable
Summary

We just encountered 000000000000modified, and it was quite annoying to search
for these, even though I knew they existed. For those that don't know that they
exist, this is essentially impossible to search for :)

(Technically we encountered it in its hex form,
3030303030303030303030306d6f646966696564, so I'm adding comments with those
forms in case that's helpful to people in the future).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

spectral created this revision.Aug 17 2018, 6:32 PM
Closed by commit rHGb623c7b23695: nodes: expand/comment the magic nodes so they are more easily searchable (authored by spectral). · Explain WhyAug 17 2018, 6:36 PM
This revision was automatically updated to reflect the committed changes.
martinvonz added a subscriber: martinvonz.Aug 18 2018, 2:12 AM
martinvonz added inline comments.
mercurial/node.py
32

Isn't it 30303030... in hex? I'd prefer to fix it by changing the actual value to be what the comment says, though.

spectral marked an inline comment as done.Aug 22 2018, 3:27 PM
spectral added inline comments.
mercurial/node.py
32

Indeed, looks like yuya already fixed this for me (by fixing the comment, not changing the id) in 1e7a462cb946, sorry about that!

Revision Contents
Changeset List

PathPackages
Mmercurial/node.py (11 lines)

Diff 10426

mercurial/node.py

# binascii.unhexlify like we used to on Python 2. # binascii.unhexlify like we used to on Python 2.
def bin(s): def bin(s):
try: try:
return binascii.unhexlify(s) return binascii.unhexlify(s)
except binascii.Error as e: except binascii.Error as e:
raise TypeError(e) raise TypeError(e)
nullrev = -1 nullrev = -1
# In hex, this is '0000000000000000000000000000000000000000'
nullid = b"\0" * 20 nullid = b"\0" * 20
nullhex = hex(nullid) nullhex = hex(nullid)
# Phony node value to stand-in for new files in some uses of # Phony node value to stand-in for new files in some uses of
# manifests. # manifests.
newnodeid = '!' * 20 # In hex, this is '2121212121212121212121212121212121212121'
addednodeid = ('0' * 15) + 'added' newnodeid = '!!!!!!!!!!!!!!!!!!!!'
modifiednodeid = ('0' * 12) + 'modified' # In hex, this is '0000000000000000000000000000006164646564'
martinvonzUnsubmitted
Not Done

Isn't it 30303030... in hex? I'd prefer to fix it by changing the actual value to be what the comment says, though.

martinvonz: Isn't it `30303030...` in hex? I'd prefer to fix it by changing the actual value to be what the…
spectralAuthorUnsubmitted
Not Done

Indeed, looks like yuya already fixed this for me (by fixing the comment, not changing the id) in 1e7a462cb946, sorry about that!

spectral: Indeed, looks like yuya already fixed this for me (by fixing the comment, not changing the id)…
addednodeid = '000000000000000added'
# In hex, this is '0000000000000000000000006d6f646966696564'
modifiednodeid = '000000000000modified'
wdirfilenodeids = {newnodeid, addednodeid, modifiednodeid} wdirfilenodeids = {newnodeid, addednodeid, modifiednodeid}
# pseudo identifiers for working directory # pseudo identifiers for working directory
# (they are experimental, so don't add too many dependencies on them) # (they are experimental, so don't add too many dependencies on them)
wdirrev = 0x7fffffff wdirrev = 0x7fffffff
# In hex, this is 'ffffffffffffffffffffffffffffffffffffffff'
wdirid = b"\xff" * 20 wdirid = b"\xff" * 20
wdirhex = hex(wdirid) wdirhex = hex(wdirid)
def short(node): def short(node):
return hex(node[:6]) return hex(node[:6])