Mercurial > hg
diff tests/test-issue5979.t @ 39473:b6db2e80a9ce
ancestors: actually iterate over ancestors in topological order (issue5979)
This code previously used a dequeue logic, the first ancestors seen were the
first ancestors to be emitted. In branching/merging situations, it can result
in ancestors being yielded before their descendants, breaking the object
contract.
We got affected by this issue while working on the copy tracing code. At about
the same time, Axel Hecht <axel@mozilla.com> reported the issue and provided
the test case used in this changeset. Thanks Axel.
Running `hg perfancestors` does not show a significant difference between the
old and the new version.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Thu, 06 Sep 2018 17:00:28 -0400 |
parents | |
children | ef6cab7930b3 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-issue5979.t Thu Sep 06 17:00:28 2018 -0400 @@ -0,0 +1,34 @@ + $ hg init r1 + $ cd r1 + $ hg ci --config ui.allowemptycommit=true -m c0 + $ hg ci --config ui.allowemptycommit=true -m c1 + $ hg ci --config ui.allowemptycommit=true -m c2 + $ hg co -q 0 + $ hg ci --config ui.allowemptycommit=true -m c3 + created new head + $ hg co -q 3 + $ hg merge --quiet + $ hg ci --config ui.allowemptycommit=true -m c4 + + $ hg log -G -T'{desc}' + @ c4 + |\ + | o c3 + | | + o | c2 + | | + o | c1 + |/ + o c0 + + + >>> from mercurial.ui import ui + >>> from mercurial.hg import repository + >>> repo = repository(ui()) + >>> for anc in repo.changelog.ancestors([4], inclusive=True): + ... print(anc) + 4 + 3 + 2 + 1 + 0