[PATCH v7] patch: add within-line color diff capacity

Yuya Nishihara yuya at tcha.org
Thu Dec 7 08:44:26 EST 2017


On Thu, 7 Dec 2017 22:07:30 +0900, Yuya Nishihara wrote:
> On Thu, 07 Dec 2017 18:26:39 +0900, matthieu.laneuville at octobus.net wrote:
> > # HG changeset patch
> > # User Matthieu Laneuville <matthieu.laneuville at octobus.net>
> > # Date 1508944418 -32400
> > #      Thu Oct 26 00:13:38 2017 +0900
> > # Node ID 6a7378611408a4bb77ad2aca8c8d0ccfe697ea26
> > # Parent  fcc96cf0983d01c542a9b5e529b434b98941371d
> > # Available At https://bitbucket.org/octobus/mercurial-devel/
> > #              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 6a7378611408
> > # EXP-Topic inline-diff
> > patch: add within-line color diff capacity
> 
> Queued, thanks.
> 
> There are some nits and minor bugs. Can you send follow-up patches?
> 
> >  def difflabel(func, *args, **kw):
> >      '''yields 2-tuples of (output, label) based on the output of func()'''
> > +    inlinecolor = False
> > +    if 'opts' in kw.keys():
> 
> Dropped '.keys()'.

Actually changed to kw.gets('opts') as it may be None.
Next time, please make sure all tests pass.


More information about the Mercurial-devel mailing list