Patchwork D7353: index: use `index.get_rev` in `histedit.adjustreplacementsfrommarkers`

login
register
mail settings
Submitter phabricator
Date Nov. 9, 2019, 4 p.m.
Message ID <a3d826c2e1b18b00b7a6c4f9ef8d95b2@localhost.localdomain>
Download mbox | patch
Permalink /patch/43092/
State Not Applicable
Headers show

Comments

phabricator - Nov. 9, 2019, 4 p.m.
Closed by commit rHGa91a26cb8ae0: index: use `index.get_rev` in `histedit.adjustreplacementsfrommarkers` (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/D7353?vs=17854&id=17905

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

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

AFFECTED FILES
  hgext/histedit.py

CHANGE DETAILS




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

Patch

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -2447,7 +2447,7 @@ 
         return oldreplacements
 
     unfi = repo.unfiltered()
-    nm = unfi.changelog.nodemap
+    get_rev = unfi.changelog.index.get_rev
     obsstore = repo.obsstore
     newreplacements = list(oldreplacements)
     oldsuccs = [r[1] for r in oldreplacements]
@@ -2458,7 +2458,7 @@ 
     succstocheck = list(seensuccs)
     while succstocheck:
         n = succstocheck.pop()
-        missing = nm.get(n) is None
+        missing = get_rev(n) is None
         markers = obsstore.successors.get(n, ())
         if missing and not markers:
             # dead end, mark it as such