Mercurial > hg
diff tests/test-log.t @ 23719:34364a4b25eb
linkrev: work around linkrev to filtered entry in 'filelog' revset
This revset is used by 'hg log FILENAME'. This prevent bugs when used on
a repository with hidden revisions.
Instead of just discarding file revisions whose linkrevs point to filtered
revisions, we put them aside and post-process them trying to find a non-filtered
introduction. See inline documentation for details about how it works.
This only fixes some of the problems. Once again, more will be needed when we can
cannot rely on child revisions of a file to find linkrev-shadowned revisions.
A test is added for 'hg log' catching such cases.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Mon, 29 Dec 2014 17:23:16 -0800 |
| parents | c624fb2c4239 |
| children | 8ec03e0ef51a |
line wrap: on
line diff
--- a/tests/test-log.t Sun Dec 21 13:06:24 2014 -0800 +++ b/tests/test-log.t Mon Dec 29 17:23:16 2014 -0800 @@ -1673,4 +1673,56 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: content1 + +Test that we use the first non-hidden changeset in that case. + +(hide the changeset) + + $ hg log -T '{node}\n' -r 1 + 2294ae80ad8447bc78383182eeac50cb049df623 + $ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623 + $ hg log -G + o changeset: 4:50b9b36e9c5d + | tag: tip + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | summary: content3 + | + @ changeset: 3:15b2327059e5 + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | summary: content2 + | + o changeset: 2:2029acd1168c + | parent: 0:ae0a3c9f9e95 + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | summary: unrelated + | + o changeset: 0:ae0a3c9f9e95 + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: content1 + + +Check that log on the file does not drop the file revision. + + $ hg log -G a + o changeset: 4:50b9b36e9c5d + | tag: tip + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | summary: content3 + | + @ changeset: 3:15b2327059e5 + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | summary: content2 + | + o changeset: 0:ae0a3c9f9e95 + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: content1 + + $ cd ..