656     util.unlinkpath(repo.join("rebasestate"), ignoremissing=True)

   656     util.unlinkpath(repo.join("rebasestate"), ignoremissing=True)

   657 

   657 

   658 def restorestatus(repo):

   658 def restorestatus(repo):

   659     'Restore a previously stored status'

   659     'Restore a previously stored status'

   660     try:

   660     try:

   661         target = None

   662         target = None

   662         collapse = False

   663         collapse = False

   663         external = nullrev

   664         external = nullrev

   664         activebookmark = None

   665         activebookmark = None

   665         state = {}

   666         state = {}

   685                 oldrev, newrev = l.split(':')

   686                 oldrev, newrev = l.split(':')

   686                 if newrev in (str(nullmerge), str(revignored)):

   687                 if newrev in (str(nullmerge), str(revignored)):

   687                     state[repo[oldrev].rev()] = int(newrev)

   688                     state[repo[oldrev].rev()] = int(newrev)

   688                 else:

   689                 else:

   689                     state[repo[oldrev].rev()] = repo[newrev].rev()

   690                     state[repo[oldrev].rev()] = repo[newrev].rev()

   690         skipped = set()

   695         skipped = set()

   691         # recompute the set of skipped revs

   696         # recompute the set of skipped revs

   692         if not collapse:

   697         if not collapse:

   693             seen = set([target])

   698             seen = set([target])

   694             for old, new in sorted(state.items()):

   699             for old, new in sorted(state.items()):