Mercurial > hg
changeset 30326:eac5c1737f79
keyword: handle filectx _customcmp
Suggested by Yuya Nishihara:
https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-October/089461.html
Related to issue5364.
| author | Christian Ebert <blacktrash@gmx.net> |
|---|---|
| date | Mon, 17 Oct 2016 17:42:46 +0200 |
| parents | f6369544bf85 |
| children | e0d9b6aab4c5 |
| files | hgext/keyword.py |
| diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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