Mercurial > public > mercurial-scm > hg
diff tests/test-hgweb-filelog.t @ 31992:3e47a40d7a7a
context: possibly yield initial fctx in blockdescendants()
If initial 'fctx' has changes in line range with respect to its parents, we
yield it first. This makes 'followlines(..., descend=True)' consistent with
'descendants()' revset which yields the starting revision.
We reuse one iteration of blockancestors() which does exactly what we want.
In test-annotate.t, adjust 'startrev' in one case to cover the situation where
the starting revision does not touch specified line range.
| author | Denis Laxalde <denis.laxalde@logilab.fr> |
|---|---|
| date | Fri, 14 Apr 2017 14:25:06 +0200 |
| parents | 604d31507f86 |
| children | befefdd34cf8 |
line wrap: on
line diff
--- a/tests/test-hgweb-filelog.t Fri Apr 14 14:09:26 2017 +0200 +++ b/tests/test-hgweb-filelog.t Fri Apr 14 14:25:06 2017 +0200 @@ -1502,6 +1502,29 @@ </html> $ hg log -r 'followlines(c, 3:4, startrev=8, descend=True) and follow(c)' -p + changeset: 8:5c6574614c37 + branch: a-branch + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: make c bigger and touch its beginning + + diff -r 46c1a66bd8fc -r 5c6574614c37 c + --- a/c Thu Jan 01 00:00:00 1970 +0000 + +++ b/c Thu Jan 01 00:00:00 1970 +0000 + @@ -1,2 +1,11 @@ + +0 + +0 + b + -c + +c+ + + + +a + +a + + + +d + +e + +f + changeset: 10:e95928d60479 branch: a-branch user: test @@ -1633,6 +1656,15 @@ <td class="age">Thu, 01 Jan 1970 00:00:00 +0000</td> <td class="author">test</td> <td class="description"> + <a href="/rev/5c6574614c37">make c bigger and touch its beginning</a> + <span class="branchname">a-branch</span> + </td> + </tr> + + <tr> + <td class="age">Thu, 01 Jan 1970 00:00:00 +0000</td> + <td class="author">test</td> + <td class="description"> <a href="/rev/e95928d60479">touch beginning of c</a> <span class="branchname">a-branch</span> </td>