Mercurial > public > mercurial-scm > hg-stable
diff mercurial/strip.py @ 47759:d7515d29761d stable 5.9rc0
branching: merge default into stable
This mark the start of the 5.9 freeze.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 21 Jul 2021 22:52:09 +0200 |
| parents | d55b71393907 |
| children | 97c5d1c22489 |
line wrap: on
line diff
--- a/mercurial/strip.py Fri Jul 09 00:25:14 2021 +0530 +++ b/mercurial/strip.py Wed Jul 21 22:52:09 2021 +0200 @@ -2,7 +2,6 @@ from .i18n import _ from .pycompat import getattr -from .node import nullid from . import ( bookmarks as bookmarksmod, cmdutil, @@ -39,7 +38,7 @@ if ( util.safehasattr(repo, b'mq') - and p2 != nullid + and p2 != repo.nullid and p2 in [x.node for x in repo.mq.applied] ): unode = p2 @@ -218,7 +217,7 @@ # if one of the wdir parent is stripped we'll need # to update away to an earlier revision update = any( - p != nullid and cl.rev(p) in strippedrevs + p != repo.nullid and cl.rev(p) in strippedrevs for p in repo.dirstate.parents() )