( )⚙ D9078 repoview: don't crash if mergestate points to non-existent node

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9078

repoview: don't crash if mergestate points to non-existent node
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG5ed6efedc457: repoview: don't crash if mergestate points to non-existent node

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
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
Mmercurial/repoview.py (6 lines)
Mtests/test-obsolete.t (6 lines)

Diff 22815

mercurial/repoview.py

# Avoid cycle: mercurial.filemerge -> mercurial.templater -> # Avoid cycle: mercurial.filemerge -> mercurial.templater ->
# mercurial.templatefuncs -> mercurial.revset -> mercurial.repoview -> # mercurial.templatefuncs -> mercurial.revset -> mercurial.repoview ->
# mercurial.mergestate -> mercurial.filemerge # mercurial.mergestate -> mercurial.filemerge
from . import mergestate from . import mergestate
ms = mergestate.mergestate.read(repo) ms = mergestate.mergestate.read(repo)
if ms.active(): if ms.active():
pinned.add(ms.localctx.rev()) for node in (ms.local, ms.other):
pinned.add(ms.otherctx.rev()) rev = cl.index.get_rev(node)
if rev is not None:
pinned.add(rev)
return pinned return pinned
def _revealancestors(pfunc, hidden, revs): def _revealancestors(pfunc, hidden, revs):
"""reveals contiguous chains of hidden ancestors of 'revs' by removing them """reveals contiguous chains of hidden ancestors of 'revs' by removing them
from 'hidden' from 'hidden'

tests/test-obsolete.t

$ hg debugmergestate $ hg debugmergestate
local (working copy): b73b8c9a4ab4da89a5a35a6f10dfb13edc84ca37 local (working copy): b73b8c9a4ab4da89a5a35a6f10dfb13edc84ca37
other (destination): f53e9479dce52f79c923908241fa54f7da90a7ad other (destination): f53e9479dce52f79c923908241fa54f7da90a7ad
file: file (state "u") file: file (state "u")
local path: file (hash 971c419dd609331343dee105fffd0f4608dc0bf2, flags "") local path: file (hash 971c419dd609331343dee105fffd0f4608dc0bf2, flags "")
ancestor path: file (node bc7ebe2d260cff30d2a39a130d84add36216f791) ancestor path: file (node bc7ebe2d260cff30d2a39a130d84add36216f791)
other path: file (node b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3) other path: file (node b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3)
extra: ancestorlinknode = b73b8c9a4ab4da89a5a35a6f10dfb13edc84ca37 extra: ancestorlinknode = b73b8c9a4ab4da89a5a35a6f10dfb13edc84ca37
BROKEN: We should be able to see the log (without the deleted commit, of course) We should be able to see the log (without the deleted commit, of course)
$ hg log -G $ hg log -G
abort: unknown revision 'b73b8c9a4ab4da89a5a35a6f10dfb13edc84ca37'! @ 0:f53e9479dce5 (draft) [tip ] first
[255]
$ cd .. $ cd ..