[PATCH STABLE] context: start walking from "introrev" in blockancestors()
Yuya Nishihara
yuya at tcha.org
Fri Apr 21 23:29:46 EDT 2017
On Fri, 21 Apr 2017 23:47:39 +0200, Denis Laxalde wrote:
> # HG changeset patch
> # User Denis Laxalde <denis at laxalde.org>
> # Date 1492717228 -7200
> # Thu Apr 20 21:40:28 2017 +0200
> # Branch stable
> # Node ID aa42fe719405c5df9ff2e402dae3609f05dd0710
> # Parent e5ffc91a2276e356a38eb75ad5055f65f90f1872
> context: start walking from "introrev" in blockancestors()
>
> Previously, calling blockancestors() with a fctx not touching file would
> sometimes yield this filectx first, instead of the first "block ancestor",
> because when compared to its parent it may have changes in specified line
> range despite not touching the file at all.
>
> Fixing this by starting the algorithm from the "base" filectx obtained using
> fctx.introrev() (as done in annotate()).
Seems fine. Queued, thanks.
More information about the Mercurial-devel
mailing list