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

stable repowidget: refactor generateSingleMenu()

Let's simply use a new local function 'entry'.

(no behavior change)

Changeset 221cc5bbcb16…

Parent 25345493d79b…

by Adrian Buehlmann

Changes to one file · Browse files at 221cc5bbcb16 Showing diff from parent 25345493d79b Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
861
862
863
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
 
 
 
 
 
 
 
 
 
 
924
925
926
927
928
929
930
931
932
933
934
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
935
936
937
 
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
880
 
 
 
 
 
 
 
 
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
 
 
 
 
 
 
 
 
 
 
 
 
 
 
903
904
905
906
907
908
909
910
911
912
913
 
 
 
 
 
 
 
 
 
 
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
@@ -861,77 +861,80 @@
  (ap and ('qtip' not in tags))     exs = self.repo.extensions() + + def entry(menu, ext=None, func=None, desc=None, icon=None, cb=None): + if ext and ext not in exs: + return + if desc is None: + menu.addSeparator() + return + act = QAction(desc, self) + act.triggered.connect(cb) + if icon: + act.setIcon(geticon(icon)) + act.enableFunc = func + menu.addAction(act) + items.append(act) +   menu = QMenu(self) - submenu = None - for type, ext, func, desc, icon, cb in ( - (0, None, isrev, _('Update...'), 'hg-update', self.updateToRevision), - (0, None, None, None, None, None), - (0, None, isctx, _('Visual diff...'), 'visualdiff', self.visualDiffRevision), - (0, None, isrev, _('Diff to local...'), 'ldiff', self.visualDiffToLocal), - (0, None, isctx, _('Browse at rev...'), 'hg-annotate', self.manifestRevision), - (0, None, None, None, None, None), - (0, None, fixed, _('Merge with...'), 'hg-merge', self.mergeWithRevision), - (0, None, None, None, None, None), - (0, None, fixed, _('Tag...'), 'hg-tag', self.tagToRevision), - (0, None, fixed, _('Bookmark...'), 'hg-bookmarks', self.bookmarkRevision), - (0, None, None, None, None, None), - (0, None, fixed, _('Backout...'), 'hg-revert', self.backoutToRevision), - (0, None, None, None, None, None), - (1, None, None, _("Export"), None, None), - (2, None, isrev, _('Export patch'), 'hg-export', self.exportRevisions), - (2, None, isrev, _('Email patch...'), 'mail-forward', self.emailRevision), - (2, None, isrev, _('Archive...'), 'hg-archive', self.archiveRevision), - (2, None, isctx, _('Copy patch'), 'copy-patch', self.copyPatch), - (0, None, None, None, None, None), - (0, None, isrev, _('Copy hash'), 'copy-hash', self.copyHash), - (0, None, None, None, None, None), - (0, 'transplant', fixed, _('Transplant to local'), 'hg-transplant', - self.transplantRevision), - (1, 'mq,rebase', None, _('Modify history'), None, None), - (2, 'mq', qgoto, _('QGoto'), 'hg-qgoto', self.qgotoRevision), - (2, 'mq', fixed, _('Import to MQ'), 'qimport', self.qimportRevision), - (2, 'mq', applied, _('Finish patch'), 'qfinish', self.qfinishRevision), - (2, None, None, None, None, None), - (2, 'rebase', fixed, _('Rebase...'), None, self.rebaseRevision), - (2, None, None, None, None, None), - (2, 'mq', fixed, _('Strip...'), 'menudelete', self.stripRevision), - (0, 'reviewboard', fixed, _('Post to Review Board...'), - 'reviewboard', self.sendToReviewBoard)):   - if ext: - enable = False - for e in ext.split(','): - if e in exs: - enable = True - break - if not enable: - continue + entry(menu, None, isrev, _('Update...'), 'hg-update', + self.updateToRevision) + entry(menu) + entry(menu, None, isctx, _('Visual diff...'), 'visualdiff', + self.visualDiffRevision) + entry(menu, None, isrev, _('Diff to local...'), 'ldiff', + self.visualDiffToLocal) + entry(menu, None, isctx, _('Browse at rev...'), 'hg-annotate', + self.manifestRevision) + entry(menu) + entry(menu, None, fixed, _('Merge with...'), 'hg-merge', + self.mergeWithRevision) + entry(menu) + entry(menu, None, fixed, _('Tag...'), 'hg-tag', + self.tagToRevision) + entry(menu, None, fixed, _('Bookmark...'), 'hg-bookmarks', + self.bookmarkRevision) + entry(menu) + entry(menu, None, fixed, _('Backout...'), 'hg-revert', + self.backoutToRevision) + entry(menu)   - if type == 0: # normal entry - m = menu - submenu = None - elif type == 1: # start submenu - m = menu - if icon: - submenu = menu.addMenu(icon, desc) - else: - submenu = menu.addMenu(desc) - continue - elif type == 2: # submenu entry - if submenu is None: - continue - m = submenu + submenu = menu.addMenu(_('Export')) + entry(submenu, None, isrev, _('Export patch'), 'hg-export', + self.exportRevisions) + entry(submenu, None, isrev, _('Email patch...'), 'mail-forward', + self.emailRevision) + entry(submenu, None, isrev, _('Archive...'), 'hg-archive', + self.archiveRevision) + entry(submenu, None, isctx, _('Copy patch'), 'copy-patch', + self.copyPatch) + entry(menu)   - if desc is None: - m.addSeparator() - else: - act = QAction(desc, self) - act.triggered.connect(cb) - if icon: - act.setIcon(geticon(icon)) - act.enableFunc = func - m.addAction(act) - items.append(act) + entry(menu, None, isrev, _('Copy hash'), 'copy-hash', + self.copyHash) + entry(menu) + + entry(menu, 'transplant', fixed, _('Transplant to local'), 'hg-transplant', + self.transplantRevision) + + if 'mq' in exs or 'rebase' in exs: + submenu = menu.addMenu(_('Modify history')) + entry(submenu, 'mq', qgoto, _('QGoto'), 'hg-qgoto', + self.qgotoRevision) + entry(submenu, 'mq', fixed, _('Import to MQ'), 'qimport', + self.qimportRevision) + entry(submenu, 'mq', applied, _('Finish patch'), 'qfinish', + self.qfinishRevision) + entry(submenu, 'mq') + entry(submenu, 'rebase', fixed, _('Rebase...'), None, + self.rebaseRevision) + entry(submenu, 'rebase') + entry(submenu, 'mq', fixed, _('Strip...'), 'menudelete', + self.stripRevision) + + entry(menu, 'reviewboard', fixed, _('Post to Review Board...'), 'reviewboard', + self.sendToReviewBoard)     self.singlecmenu = menu   self.singlecmenuitems = items