hgext/rebase.py
changeset 33762 86aca74a063b
parent 33691 609606d21765
parent 33620 5a5f600b06ad
child 33807 0975506120fb
equal deleted inserted replaced
33761:e6d8ee3c9ec3 33762:86aca74a063b
   470             editform = 'rebase.collapse'
   470             editform = 'rebase.collapse'
   471             if self.collapsemsg:
   471             if self.collapsemsg:
   472                 commitmsg = self.collapsemsg
   472                 commitmsg = self.collapsemsg
   473             else:
   473             else:
   474                 commitmsg = 'Collapsed revision'
   474                 commitmsg = 'Collapsed revision'
   475                 for rebased in self.state:
   475                 for rebased in sorted(self.state):
   476                     if rebased not in self.skipped and\
   476                     if rebased not in self.skipped and\
   477                        self.state[rebased] > nullmerge:
   477                        self.state[rebased] > nullmerge:
   478                         commitmsg += '\n* %s' % repo[rebased].description()
   478                         commitmsg += '\n* %s' % repo[rebased].description()
   479                 editopt = True
   479                 editopt = True
   480             editor = cmdutil.getcommiteditor(edit=editopt, editform=editform)
   480             editor = cmdutil.getcommiteditor(edit=editopt, editform=editform)