Mercurial > public > mercurial-scm > hg

comparison mercurial/logcmdutil.py @ 46498:3caa3698335e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
log: respect diff.merge in -p output Differential Revision: https://phab.mercurial-scm.org/D9958
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 04 Feb 2021 13:32:11 -0800
parents 4a012e531066
children 6f4a481f182a
comparison
equal deleted inserted replaced
46497:4a012e531066 46498:3caa3698335e
245 def showdiff(self, ui, ctx, diffopts, graphwidth=0, stat=False): 245 def showdiff(self, ui, ctx, diffopts, graphwidth=0, stat=False):
246 diffordiffstat( 246 diffordiffstat(
247 ui, 247 ui,
248 ctx.repo(), 248 ctx.repo(),
249 diffopts, 249 diffopts,
250 ctx.p1(), 250 diff_parent(ctx),
251 ctx, 251 ctx,
252 match=self._makefilematcher(ctx), 252 match=self._makefilematcher(ctx),
253 stat=stat, 253 stat=stat,
254 graphwidth=graphwidth, 254 graphwidth=graphwidth,
255 hunksfilterfn=self._makehunksfilter(ctx), 255 hunksfilterfn=self._makehunksfilter(ctx),