Mercurial > public > mercurial-scm > hg-stable
diff mercurial/logcmdutil.py @ 46843:728d89f6f9b1
refactor: prefer checks against nullrev over nullid
A common pattern is using a changeset context and obtaining the node to
compare against nullid. Change this to obtain the nullrev instead. In
the future, the nullid becomes a property of the repository and is no
longer a global constant, so using nullrev is much easier to reason
about. Python function call overhead makes the difference moot, but
future changes will result in more dictionary lookups otherwise, so
prefer the simpler pattern.
Differential Revision: https://phab.mercurial-scm.org/D10290
| author | Joerg Sonnenberger <joerg@bec.de> |
|---|---|
| date | Tue, 30 Mar 2021 02:32:30 +0200 |
| parents | d4ba4d51f85f |
| children | d55b71393907 |
line wrap: on
line diff
--- a/mercurial/logcmdutil.py Tue Mar 30 02:33:12 2021 +0200 +++ b/mercurial/logcmdutil.py Tue Mar 30 02:32:30 2021 +0200 @@ -14,6 +14,7 @@ from .i18n import _ from .node import ( nullid, + nullrev, wdirid, wdirrev, ) @@ -82,7 +83,7 @@ If diff.merge is enabled, an overlayworkingctx of the auto-merged parents will be returned. """ repo = ctx.repo() - if repo.ui.configbool(b"diff", b"merge") and ctx.p2().node() != nullid: + if repo.ui.configbool(b"diff", b"merge") and ctx.p2().rev() != nullrev: # avoid cycle context -> subrepo -> cmdutil -> logcmdutil from . import context