Hi, Only compare via filelog when needed, i.e. when comparing against the working directory. These patches use isinstance(fctx, context.workingfilectx) to check this. The 2nd patch does the same for hgext.keyword adding files configured for keyword expansion to the condition. c