hgext/rebase.py
changeset 46835 c2438f2f635c
parent 46834 535de0e34a79
child 46836 80cac9936324
equal deleted inserted replaced
46834:535de0e34a79 46835:c2438f2f635c
   445         for destrev in sorted(set(destmap.values())):
   445         for destrev in sorted(set(destmap.values())):
   446             dest = self.repo[destrev]
   446             dest = self.repo[destrev]
   447             if dest.closesbranch() and not self.keepbranchesf:
   447             if dest.closesbranch() and not self.keepbranchesf:
   448                 self.ui.status(_(b'reopening closed branch head %s\n') % dest)
   448                 self.ui.status(_(b'reopening closed branch head %s\n') % dest)
   449 
   449 
   450         self.prepared = True
       
   451 
       
   452         # Calculate self.obsolete_* sets
   450         # Calculate self.obsolete_* sets
   453         self._handleskippingobsolete()
   451         self._handleskippingobsolete()
       
   452 
       
   453         self.prepared = True
   454 
   454 
   455     def _assignworkingcopy(self):
   455     def _assignworkingcopy(self):
   456         if self.inmemory:
   456         if self.inmemory:
   457             from mercurial.context import overlayworkingctx
   457             from mercurial.context import overlayworkingctx
   458 
   458 
  2190     without a successor in destination, that would cause divergence.
  2190     without a successor in destination, that would cause divergence.
  2191     """
  2191     """
  2192     obsolete_with_successor_in_destination = {}
  2192     obsolete_with_successor_in_destination = {}
  2193     obsolete_with_successor_in_rebase_set = set()
  2193     obsolete_with_successor_in_rebase_set = set()
  2194 
  2194 
  2195     assert repo.filtername is None
       
  2196     cl = repo.changelog
  2195     cl = repo.changelog
  2197     get_rev = cl.index.get_rev
  2196     get_rev = cl.index.get_rev
  2198     extinctrevs = set(repo.revs(b'extinct()'))
  2197     extinctrevs = set(repo.revs(b'extinct()'))
  2199     for srcrev in rebaseobsrevs:
  2198     for srcrev in rebaseobsrevs:
  2200         srcnode = cl.node(srcrev)
  2199         srcnode = cl.node(srcrev)