This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7021

notify: cast hash to bytes
ClosedPublic

Authored by indygreg on Oct 8 2019, 12:42 AM.

Details

Reviewers
marmoute
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc32531444cdc: notify: cast hash to bytes
Summary

This is needed to avoid a str/bytes mismatch when interpolating a
line or 2 later.

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

indygreg created this revision.Oct 8 2019, 12:42 AM
marmoute accepted this revision.Oct 8 2019, 6:32 AM
marmoute added a subscriber: marmoute.

This looks good to me.

pulkit accepted this revision.Oct 10 2019, 9:30 AM
This revision is now accepted and ready to land.Oct 10 2019, 9:30 AM
indygreg added a commit: rHGc32531444cdc: notify: cast hash to bytes.Oct 10 2019, 10:10 AM
Closed by commit rHGc32531444cdc: notify: cast hash to bytes (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/notify.py (6 lines)

Diff 17045

hgext/notify.py

from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
encoding, encoding,
error, error,
logcmdutil, logcmdutil,
mail, mail,
patch, patch,
pycompat,
registrar, registrar,
util, util,
) )
from mercurial.utils import ( from mercurial.utils import (
dateutil, dateutil,
stringutil, stringutil,
) )
def messageid(ctx, domain, messageidseed): def messageid(ctx, domain, messageidseed):
if domain and messageidseed: if domain and messageidseed:
host = domain host = domain
else: else:
host = encoding.strtolocal(socket.getfqdn()) host = encoding.strtolocal(socket.getfqdn())
if messageidseed: if messageidseed:
messagehash = hashlib.sha512(ctx.hex() + messageidseed) messagehash = hashlib.sha512(ctx.hex() + messageidseed)
messageid = b'<hg.%s@%s>' % (messagehash.hexdigest()[:64], host) messageid = b'<hg.%s@%s>' % (
pycompat.sysbytes(messagehash.hexdigest()[:64]),
host,
)
else: else:
messageid = b'<hg.%s.%d.%d@%s>' % ( messageid = b'<hg.%s.%d.%d@%s>' % (
ctx, ctx,
int(time.time()), int(time.time()),
hash(ctx.repo().root), hash(ctx.repo().root),
host, host,
) )
return encoding.strfromlocal(messageid) return encoding.strfromlocal(messageid)