Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

history: Rebase a revision on top of another.

Changeset 09c63f5a9cfa…

Parent f432f6a6cf61…

by Dimitris Glezos

Changes to one file · Browse files at 09c63f5a9cfa Showing diff from parent f432f6a6cf61 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​history.py Stacked
 
412
413
414
 
 
 
 
 
 
 
415
416
417
 
678
679
680
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
681
682
683
 
412
413
414
415
416
417
418
419
420
421
422
423
424
 
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
@@ -412,6 +412,13 @@
  self.bundle_revs))   self.cmenu_merge2 = create_menu(_('_merge with'), self.merge)   m.append(self.cmenu_merge2) + + # need rebase extension for rebase command + extensions.loadall(self.ui) + extensions.load(self.ui, 'rebase', None) + m.append(create_menu(_('rebase on top of selected'), + self.rebase_selected)) +   m.connect_after('selection-done', self.restore_original_selection)   m.show_all()   return m @@ -678,6 +685,24 @@
  dlg.run()   dlg.hide()   + def rebase_selected(self, menuitem): + """Rebase revision on top of selection (1st on top of 2nd).""" + revs = list(self.revs) + res = gdialog.Confirm(_('Confirm Rebase Revision'), [], self, + _('Rebase revision %d on top of %d?') % (revs[0], revs[1])).run() + if res != gtk.RESPONSE_YES: + return + cmdline = ['hg', 'rebase', '--source', str(revs[0]), + '--dest', str(revs[1])] + dialog = hgcmd.CmdDialog(cmdline) + dialog.show_all() + dialog.run() + dialog.hide() + self.repo.invalidate() + self.reload_log() + self.changeview._buffer.set_text('') + self.changeview._filelist.clear() +   def add_tag(self, menuitem):   # save tag info for detecting new tags added   oldtags = self.repo.tagslist()