Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable Merge

Changeset 8b8b3abff139…

Parents c0081aacddb7…

Parents 71fbd48b5699…

by Steve Borho

Changes to one file · Browse files at 8b8b3abff139 Showing diff from parent c0081aacddb7 71fbd48b5699 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
875
876
877
878
 
879
880
881
 
901
902
903
904
 
905
906
907
 
927
928
929
930
 
931
932
933
 
1237
1238
1239
 
1240
1241
 
1242
1243
1244
 
875
876
877
 
878
879
880
881
 
901
902
903
 
904
905
906
907
 
927
928
929
 
930
931
932
933
 
1237
1238
1239
1240
1241
 
1242
1243
1244
1245
@@ -875,7 +875,7 @@
  act.enableFunc = func   menu.addAction(act)   items.append(act) - +   menu = QMenu(self)     entry(menu, None, isrev, _('Update...'), 'hg-update', @@ -901,7 +901,7 @@
  entry(menu)     submenu = menu.addMenu(_('Export')) - entry(submenu, None, isrev, _('Export patch'), 'hg-export', + entry(submenu, None, isrev, _('Export patch'), 'hg-export',   self.exportRevisions)   entry(submenu, None, isrev, _('Email patch...'), 'mail-forward',   self.emailRevision) @@ -927,7 +927,7 @@
  entry(submenu, 'mq', applied, _('Finish patch'), 'qfinish',   self.qfinishRevision)   entry(submenu, 'mq') - entry(submenu, 'rebase', fixed, _('Rebase...'), None, + entry(submenu, 'rebase', fixed, _('Rebase...'), None,   self.rebaseRevision)   entry(submenu, 'rebase')   entry(submenu, 'mq', fixed, _('Strip...'), 'menudelete', @@ -1237,8 +1237,9 @@
  cmdline = ['qpop', '--all', '--repository', self.repo.root]   self.runCommand(_('QGoto - TortoiseHg'), cmdline)   else: + patchname = self.repo.changectx(self.rev).thgmqpatchname()   self.taskTabsWidget.setCurrentIndex(self.mqTabIndex) - self.mqDemand.forward('qgotoRevision', self.rev) + self.mqDemand.forward('qgotoRevision', patchname)     def qpushMoveRevision(self):   """Make REV the top applied patch"""