Mercurial > hg
comparison mercurial/repoview.py @ 45523:5ed6efedc457 stable
repoview: don't crash if mergestate points to non-existent node
Differential Revision: https://phab.mercurial-scm.org/D9078
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 23 Sep 2020 15:36:15 -0700 |
| parents | aaeccdb6e654 |
| children | 341e014fe0fb |
comparison
equal
deleted
inserted
replaced
| 45522:5a555d6e0d90 | 45523:5ed6efedc457 |
|---|---|
| 68 # mercurial.mergestate -> mercurial.filemerge | 68 # mercurial.mergestate -> mercurial.filemerge |
| 69 from . import mergestate | 69 from . import mergestate |
| 70 | 70 |
| 71 ms = mergestate.mergestate.read(repo) | 71 ms = mergestate.mergestate.read(repo) |
| 72 if ms.active(): | 72 if ms.active(): |
| 73 pinned.add(ms.localctx.rev()) | 73 for node in (ms.local, ms.other): |
| 74 pinned.add(ms.otherctx.rev()) | 74 rev = cl.index.get_rev(node) |
| 75 if rev is not None: | |
| 76 pinned.add(rev) | |
| 75 | 77 |
| 76 return pinned | 78 return pinned |
| 77 | 79 |
| 78 | 80 |
| 79 def _revealancestors(pfunc, hidden, revs): | 81 def _revealancestors(pfunc, hidden, revs): |