##// END OF EJS Templates
index: use `index.get_rev` in `histedit.adjustreplacementsfrommarkers`...
marmoute -
r43968:418ca164 default
parent child Browse files
Show More
@@ -2447,7 +2447,7 b' def adjustreplacementsfrommarkers(repo, '
2447 return oldreplacements
2447 return oldreplacements
2448
2448
2449 unfi = repo.unfiltered()
2449 unfi = repo.unfiltered()
2450 nm = unfi.changelog.nodemap
2450 get_rev = unfi.changelog.index.get_rev
2451 obsstore = repo.obsstore
2451 obsstore = repo.obsstore
2452 newreplacements = list(oldreplacements)
2452 newreplacements = list(oldreplacements)
2453 oldsuccs = [r[1] for r in oldreplacements]
2453 oldsuccs = [r[1] for r in oldreplacements]
@@ -2458,7 +2458,7 b' def adjustreplacementsfrommarkers(repo, '
2458 succstocheck = list(seensuccs)
2458 succstocheck = list(seensuccs)
2459 while succstocheck:
2459 while succstocheck:
2460 n = succstocheck.pop()
2460 n = succstocheck.pop()
2461 missing = nm.get(n) is None
2461 missing = get_rev(n) is None
2462 markers = obsstore.successors.get(n, ())
2462 markers = obsstore.successors.get(n, ())
2463 if missing and not markers:
2463 if missing and not markers:
2464 # dead end, mark it as such
2464 # dead end, mark it as such
General Comments 0
You need to be logged in to leave comments. Login now