This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7066

phabricator: convert phabhunk and phabchange keys to bytes when finalising
ClosedPublic

Authored by Kwan on Oct 12 2019, 9:45 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG162b81e65e60: phabricator: convert phabhunk and phabchange keys to bytes when finalising
rHG7dca674a456b: phabricator: convert phabhunk and phabchange keys to bytes when finalising
Summary

I thought I had included this code already but I'd missed it out. One of the
disadvantages of attrs is that all the keys are unicode strings on py3, but we
need them to be byte strings.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

Kwan created this revision.Oct 12 2019, 9:45 AM

I'd missed out the attrs key conversion needed on py3.

Kwan added a commit: rHG7dca674a456b: phabricator: convert phabhunk and phabchange keys to bytes when finalising.Oct 16 2019, 4:51 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG7dca674a456b: phabricator: convert phabhunk and phabchange keys to bytes when finalising (authored by Kwan). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (6 lines)

Diff 17101

hgext/phabricator.py

self.oldProperties[b'unix:filemode'] = value self.oldProperties[b'unix:filemode'] = value
def addnewmode(self, value): def addnewmode(self, value):
self.newProperties[b'unix:filemode'] = value self.newProperties[b'unix:filemode'] = value
def addhunk(self, hunk): def addhunk(self, hunk):
if not isinstance(hunk, phabhunk): if not isinstance(hunk, phabhunk):
raise error.Abort(b'phabchange.addhunk only takes phabhunks') raise error.Abort(b'phabchange.addhunk only takes phabhunks')
self.hunks.append(hunk) self.hunks.append(pycompat.byteskwargs(attr.asdict(hunk)))
# It's useful to include these stats since the Phab web UI shows them, # It's useful to include these stats since the Phab web UI shows them,
# and uses them to estimate how large a change a Revision is. Also used # and uses them to estimate how large a change a Revision is. Also used
# in email subjects for the [+++--] bit. # in email subjects for the [+++--] bit.
self.addLines += hunk.addLines self.addLines += hunk.addLines
self.delLines += hunk.delLines self.delLines += hunk.delLines
@attr.s @attr.s
lintStatus = attr.ib(default=b'none') # camelcase-required lintStatus = attr.ib(default=b'none') # camelcase-required
unitStatus = attr.ib(default=b'none') # camelcase-required unitStatus = attr.ib(default=b'none') # camelcase-required
changes = attr.ib(default=attr.Factory(dict)) changes = attr.ib(default=attr.Factory(dict))
repositoryPHID = attr.ib(default=None) # camelcase-required repositoryPHID = attr.ib(default=None) # camelcase-required
def addchange(self, change): def addchange(self, change):
if not isinstance(change, phabchange): if not isinstance(change, phabchange):
raise error.Abort(b'phabdiff.addchange only takes phabchanges') raise error.Abort(b'phabdiff.addchange only takes phabchanges')
self.changes[change.currentPath] = change self.changes[change.currentPath] = pycompat.byteskwargs(
attr.asdict(change)
)
def maketext(pchange, ctx, fname): def maketext(pchange, ctx, fname):
"""populate the phabchange for a text file""" """populate the phabchange for a text file"""
repo = ctx.repo() repo = ctx.repo()
fmatcher = match.exact([fname]) fmatcher = match.exact([fname])
diffopts = mdiff.diffopts(git=True, context=32767) diffopts = mdiff.diffopts(git=True, context=32767)
_pfctx, _fctx, header, fhunks = next( _pfctx, _fctx, header, fhunks = next(