Patchwork D7328: index: use `index.has_node` in `revlog.addgroup`

login
register
mail settings
Submitter phabricator
Date Nov. 9, 2019, 8:40 a.m.
Message ID <d2269ed29d668fa84cb858f7cbb32a5e@localhost.localdomain>
Download mbox | patch
Permalink /patch/43051/
State Not Applicable
Headers show

Comments

phabricator - Nov. 9, 2019, 8:40 a.m.
Closed by commit rHG729840ecbae5: index: use `index.has_node` in `revlog.addgroup` (authored by marmoute).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7328?vs=17841&id=17867

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7328/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7328

AFFECTED FILES
  mercurial/revlog.py

CHANGE DETAILS




To: marmoute, indygreg, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -2306,18 +2306,18 @@ 
 
                 nodes.append(node)
 
-                if node in self.nodemap:
+                if self.index.has_node(node):
                     self._nodeduplicatecallback(transaction, node)
                     # this can happen if two branches make the same change
                     continue
 
                 for p in (p1, p2):
-                    if p not in self.nodemap:
+                    if not self.index.has_node(p):
                         raise error.LookupError(
                             p, self.indexfile, _(b'unknown parent')
                         )
 
-                if deltabase not in self.nodemap:
+                if not self.index.has_node(deltabase):
                     raise error.LookupError(
                         deltabase, self.indexfile, _(b'unknown delta base')
                     )