This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7045

phabricator: add the maketext function
ClosedPublic

Authored by Kwan on Oct 10 2019, 5:52 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGf742fabad507: phabricator: add the maketext function
Summary

This add the diff data for a text file to a phabchange.

Diff Detail

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

Event Timeline

Kwan created this revision.Oct 10 2019, 5:52 PM
Kwan updated this revision to Diff 17076.Oct 11 2019, 1:54 PM

Fix some test-check-code issues, and one test-check-pyflakes unused local.

indygreg accepted this revision.Oct 11 2019, 9:46 PM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
hgext/phabricator.py
557

The use of a single next() is a bit weird. But I suppose it gets the job done since we're expecting at most one file's diff.

This revision is now accepted and ready to land.Oct 11 2019, 9:46 PM
Kwan added a commit: rHGf742fabad507: phabricator: add the maketext function.Oct 11 2019, 9:56 PM
Closed by commit rHGf742fabad507: phabricator: add the maketext function (authored by Kwan). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (31 lines)

Diff 17076

hgext/phabricator.py

from mercurial.thirdparty import attr from mercurial.thirdparty import attr
from mercurial import ( from mercurial import (
cmdutil, cmdutil,
context, context,
encoding, encoding,
error, error,
exthelper, exthelper,
httpconnection as httpconnectionmod, httpconnection as httpconnectionmod,
match,
mdiff, mdiff,
obsutil, obsutil,
parser, parser,
patch, patch,
phases, phases,
pycompat, pycompat,
scmutil, scmutil,
smartset, smartset,
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] = change
def maketext(pchange, ctx, fname):
"""populate the phabchange for a text file"""
repo = ctx.repo()
fmatcher = match.exact([fname])
diffopts = mdiff.diffopts(git=True, context=32767)
_pfctx, _fctx, header, fhunks = next(
indygregUnsubmitted
Not Done

The use of a single next() is a bit weird. But I suppose it gets the job done since we're expecting at most one file's diff.

indygreg: The use of a single `next()` is a bit weird. But I suppose it gets the job done since we're…
patch.diffhunks(repo, ctx.p1(), ctx, fmatcher, opts=diffopts)
)
for fhunk in fhunks:
(oldOffset, oldLength, newOffset, newLength), lines = fhunk
corpus = b''.join(lines[1:])
shunk = list(header)
shunk.extend(lines)
_mf, _mt, addLines, delLines, _hb = patch.diffstatsum(
patch.diffstatdata(util.iterlines(shunk))
)
pchange.addhunk(
phabhunk(
oldOffset,
oldLength,
newOffset,
newLength,
corpus,
addLines,
delLines,
)
)
def creatediff(ctx): def creatediff(ctx):
"""create a Differential Diff""" """create a Differential Diff"""
repo = ctx.repo() repo = ctx.repo()
repophid = getrepophid(repo) repophid = getrepophid(repo)
# Create a "Differential Diff" via "differential.createrawdiff" API # Create a "Differential Diff" via "differential.createrawdiff" API
params = {b'diff': getdiff(ctx, mdiff.diffopts(git=True, context=32767))} params = {b'diff': getdiff(ctx, mdiff.diffopts(git=True, context=32767))}
if repophid: if repophid:
params[b'repositoryPHID'] = repophid params[b'repositoryPHID'] = repophid