( )⚙ D9077 tests: demonstrate crash caused by pinning of non-existent mergestate node

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9077

tests: demonstrate crash caused by pinning of non-existent mergestate node
ClosedPublic

Authored by martinvonz on Sep 23 2020, 7:10 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG5a555d6e0d90: tests: demonstrate crash caused by pinning of non-existent mergestate node
Summary

If the mergestate somehow contains a reference to a non-existent node,
it causes most commands to crash since aaeccdb6e654 (repoview: pin
revisions for local and other when a merge is active,
2020-09-04). This patch adds a test showing that.

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Sep 23 2020, 7:10 PM
martinvonz added a comment.Sep 23 2020, 7:13 PM

Reminder that this is meant for the stable branch

pulkit accepted this revision.Sep 24 2020, 2:53 AM
This revision is now accepted and ready to land.Sep 24 2020, 2:53 AM

Revision Contents
Changeset List

PathPackages
Mtests/test-obsolete.t (41 lines)

Diff 22814

tests/test-obsolete.t

$ hg add b.cpp $ hg add b.cpp
$ hg commit -m 'Add b.cpp' $ hg commit -m 'Add b.cpp'
$ echo 'Hello' > b.cpp $ echo 'Hello' > b.cpp
$ hg amend -n 'Testing::Obsstore2' --config extensions.amend= $ hg amend -n 'Testing::Obsstore2' --config extensions.amend=
$ hg debugobsolete $ hg debugobsolete
d1b09fe3ad2b2a03e23a72f0c582e29a49570145 1a1a11184d2588af24e767e5335d5d9d07e8c550 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'Testing::Obsstore', 'operation': 'amend', 'user': 'test'} d1b09fe3ad2b2a03e23a72f0c582e29a49570145 1a1a11184d2588af24e767e5335d5d9d07e8c550 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'Testing::Obsstore', 'operation': 'amend', 'user': 'test'}
1bfd8e3868f641e048b6667cd672c68932f26d00 79959ca316d5b27ac6be1dd0cfd0843a5b5412eb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'Testing::Obsstore2', 'operation': 'amend', 'user': 'test'} 1bfd8e3868f641e048b6667cd672c68932f26d00 79959ca316d5b27ac6be1dd0cfd0843a5b5412eb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'Testing::Obsstore2', 'operation': 'amend', 'user': 'test'}
$ cd .. $ cd ..
Test that pinning of revisions in broken mergestate doesn't cause crash
$ hg init pinning-broken-mergestate
$ cd pinning-broken-mergestate
$ echo a > file
$ hg ci -Aqm first
Create a pruned commit so pinning comes into play
$ echo pruned > pruned
$ hg ci -Aqm pruned
$ hg co -q 0
$ hg debugobsolete $(getid pruned)
1 new obsolescence markers
obsoleted 1 changesets
Back up changelog, so we can restore it later after causing merge conflicts
with it, thus ending up with mergestate that points to a non-existent commit
$ cp .hg/store/00changelog.i .hg/store/00changelog.i.first
$ echo b > file
$ hg ci -qm second
$ echo c > file
$ hg co -m 0
merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]
$ mv -f .hg/store/00changelog.i.first .hg/store/00changelog.i
The local node should now point to a non-existent commit
$ hg debugmergestate
local (working copy): b73b8c9a4ab4da89a5a35a6f10dfb13edc84ca37
other (destination): f53e9479dce52f79c923908241fa54f7da90a7ad
file: file (state "u")
local path: file (hash 971c419dd609331343dee105fffd0f4608dc0bf2, flags "")
ancestor path: file (node bc7ebe2d260cff30d2a39a130d84add36216f791)
other path: file (node b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3)
extra: ancestorlinknode = b73b8c9a4ab4da89a5a35a6f10dfb13edc84ca37
BROKEN: We should be able to see the log (without the deleted commit, of course)
$ hg log -G
abort: unknown revision 'b73b8c9a4ab4da89a5a35a6f10dfb13edc84ca37'!
[255]
$ cd ..