mercurial/localrepo.py
changeset 43537 7f489b9a79a1
parent 43506 9f70512ae2cf
child 43555 ded3d545b6f0
equal deleted inserted replaced
43536:bf6fa330e0a5 43537:7f489b9a79a1
  2349             )
  2349             )
  2350         if self.svfs.exists(b'undo.phaseroots'):
  2350         if self.svfs.exists(b'undo.phaseroots'):
  2351             self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True)
  2351             self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True)
  2352         self.invalidate()
  2352         self.invalidate()
  2353 
  2353 
  2354         parentgone = any(p not in self.changelog.nodemap for p in parents)
  2354         has_node = self.changelog.index.has_node
       
  2355         parentgone = any(not has_node(p) for p in parents)
  2355         if parentgone:
  2356         if parentgone:
  2356             # prevent dirstateguard from overwriting already restored one
  2357             # prevent dirstateguard from overwriting already restored one
  2357             dsguard.close()
  2358             dsguard.close()
  2358 
  2359 
  2359             narrowspec.restorebackup(self, b'undo.narrowspec')
  2360             narrowspec.restorebackup(self, b'undo.narrowspec')