# HG changeset patch # User Christian Ebert # Date 1476718966 -7200 # Node ID eac5c1737f794d65c0673bf28e0d73e8cfe8c417 # Parent f6369544bf851fc367db7efb1676f0cc249fa89b keyword: handle filectx _customcmp Suggested by Yuya Nishihara: https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-October/089461.html Related to issue5364. diff -r f6369544bf85 -r eac5c1737f79 hgext/keyword.py --- a/hgext/keyword.py Thu Oct 20 22:20:31 2016 +0900 +++ b/hgext/keyword.py Mon Oct 17 17:42:46 2016 +0200 @@ -737,6 +737,8 @@ return ret def kwfilectx_cmp(orig, self, fctx): + if fctx._customcmp: + return fctx.cmp(self) # keyword affects data size, comparing wdir and filelog size does # not make sense if (fctx._filenode is None and