This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5891

patch: pass in context objects into diffhunks() (API)
ClosedPublic

Authored by martinvonz on Feb 8 2019, 3:30 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe834f6f6f221: patch: pass in context objects into diffhunks() (API)
Summary

It's a pretty low-level function and having the contexts in
patch.diff() makes future patches easier.

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

martinvonz created this revision.Feb 8 2019, 3:30 AM
Closed by commit rHGe834f6f6f221: patch: pass in context objects into diffhunks() (API) (authored by martinvonz). · Explain WhyFeb 9 2019, 4:35 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/webutil.py (4 lines)
Mmercurial/patch.py (16 lines)

Diff 13948

mercurial/hgweb/webutil.py

def _diffsgen(context, repo, ctx, basectx, files, style, stripecount, def _diffsgen(context, repo, ctx, basectx, files, style, stripecount,
linerange, lineidprefix): linerange, lineidprefix):
if files: if files:
m = match.exact(repo.root, repo.getcwd(), files) m = match.exact(repo.root, repo.getcwd(), files)
else: else:
m = match.always(repo.root, repo.getcwd()) m = match.always(repo.root, repo.getcwd())
diffopts = patch.diffopts(repo.ui, untrusted=True) diffopts = patch.diffopts(repo.ui, untrusted=True)
node1 = basectx.node()
node2 = ctx.node()
parity = paritygen(stripecount) parity = paritygen(stripecount)
diffhunks = patch.diffhunks(repo, node1, node2, m, opts=diffopts) diffhunks = patch.diffhunks(repo, basectx, ctx, m, opts=diffopts)
for blockno, (fctx1, fctx2, header, hunks) in enumerate(diffhunks, 1): for blockno, (fctx1, fctx2, header, hunks) in enumerate(diffhunks, 1):
if style != 'raw': if style != 'raw':
header = header[1:] header = header[1:]
lines = [h + '\n' for h in header] lines = [h + '\n' for h in header]
for hunkrange, hunklines in hunks: for hunkrange, hunklines in hunks:
if linerange is not None and hunkrange is not None: if linerange is not None and hunkrange is not None:
s1, l1, s2, l2 = hunkrange s1, l1, s2, l2 = hunkrange
if not mdiff.hunkinrange((s2, l2), linerange): if not mdiff.hunkinrange((s2, l2), linerange):

mercurial/patch.py

patterns that fall outside it will be ignored. patterns that fall outside it will be ignored.
copy, if not empty, should contain mappings {dst@y: src@x} of copy copy, if not empty, should contain mappings {dst@y: src@x} of copy
information. information.
hunksfilterfn, if not None, should be a function taking a filectx and hunksfilterfn, if not None, should be a function taking a filectx and
hunks generator that may yield filtered hunks. hunks generator that may yield filtered hunks.
''' '''
if not node1 and not node2:
node1 = repo.dirstate.p1()
ctx1 = repo[node1]
ctx2 = repo[node2]
for fctx1, fctx2, hdr, hunks in diffhunks( for fctx1, fctx2, hdr, hunks in diffhunks(
repo, node1=node1, node2=node2, repo, ctx1=ctx1, ctx2=ctx2,
match=match, changes=changes, opts=opts, match=match, changes=changes, opts=opts,
losedatafn=losedatafn, prefix=prefix, relroot=relroot, copy=copy, losedatafn=losedatafn, prefix=prefix, relroot=relroot, copy=copy,
): ):
if hunksfilterfn is not None: if hunksfilterfn is not None:
# If the file has been removed, fctx2 is None; but this should # If the file has been removed, fctx2 is None; but this should
# not occur here since we catch removed files early in # not occur here since we catch removed files early in
# logcmdutil.getlinerangerevs() for 'hg log -L'. # logcmdutil.getlinerangerevs() for 'hg log -L'.
assert fctx2 is not None, \ assert fctx2 is not None, \
'fctx2 unexpectly None in diff hunks filtering' 'fctx2 unexpectly None in diff hunks filtering'
hunks = hunksfilterfn(fctx2, hunks) hunks = hunksfilterfn(fctx2, hunks)
text = ''.join(sum((list(hlines) for hrange, hlines in hunks), [])) text = ''.join(sum((list(hlines) for hrange, hlines in hunks), []))
if hdr and (text or len(hdr) > 1): if hdr and (text or len(hdr) > 1):
yield '\n'.join(hdr) + '\n' yield '\n'.join(hdr) + '\n'
if text: if text:
yield text yield text
def diffhunks(repo, node1=None, node2=None, match=None, changes=None, def diffhunks(repo, ctx1, ctx2, match=None, changes=None,
opts=None, losedatafn=None, prefix='', relroot='', copy=None): opts=None, losedatafn=None, prefix='', relroot='', copy=None):
"""Yield diff of changes to files in the form of (`header`, `hunks`) tuples """Yield diff of changes to files in the form of (`header`, `hunks`) tuples
where `header` is a list of diff headers and `hunks` is an iterable of where `header` is a list of diff headers and `hunks` is an iterable of
(`hunkrange`, `hunklines`) tuples. (`hunkrange`, `hunklines`) tuples.
See diff() for the meaning of parameters. See diff() for the meaning of parameters.
""" """
if opts is None: if opts is None:
opts = mdiff.defaultopts opts = mdiff.defaultopts
if not node1 and not node2:
node1 = repo.dirstate.p1()
def lrugetfilectx(): def lrugetfilectx():
cache = {} cache = {}
order = collections.deque() order = collections.deque()
def getfilectx(f, ctx): def getfilectx(f, ctx):
fctx = ctx.filectx(f, filelog=cache.get(f)) fctx = ctx.filectx(f, filelog=cache.get(f))
if f not in cache: if f not in cache:
if len(cache) > 20: if len(cache) > 20:
del cache[order.popleft()] del cache[order.popleft()]
cache[f] = fctx.filelog() cache[f] = fctx.filelog()
else: else:
order.remove(f) order.remove(f)
order.append(f) order.append(f)
return fctx return fctx
return getfilectx return getfilectx
getfilectx = lrugetfilectx() getfilectx = lrugetfilectx()
ctx1 = repo[node1]
ctx2 = repo[node2]
if relroot: if relroot:
relrootmatch = scmutil.match(ctx2, pats=[relroot], default='path') relrootmatch = scmutil.match(ctx2, pats=[relroot], default='path')
match = matchmod.intersectmatchers(match, relrootmatch) match = matchmod.intersectmatchers(match, relrootmatch)
if not changes: if not changes:
changes = ctx1.status(ctx2, match=match) changes = ctx1.status(ctx2, match=match)
modified, added, removed = changes[:3] modified, added, removed = changes[:3]