Commits

Yuya Nishihara committed 8bf4779 Merge

merge

Comments (0)

Files changed (2)

fv-extraclosure.diff

-# HG changeset patch
-# Parent 33d9b9fee43819074f9e275a533d4ace5c614362
-
-diff --git a/tortoisehg/hgqt/fileview.py b/tortoisehg/hgqt/fileview.py
---- a/tortoisehg/hgqt/fileview.py
-+++ b/tortoisehg/hgqt/fileview.py
-@@ -877,12 +877,8 @@ class HgFileView(QFrame):
-                 actmarkexcluded.triggered.connect(toggleMarkExcluded)
-             if selection:
-                 menu.addSeparator()
--                for name, func in [(_('&Search in Current File'), sann),
--                        (_('Search in All &History'), sreq(all=True))]:
--                    def add(name, func):
--                        action = menu.addAction(name)
--                        action.triggered.connect(func)
--                    add(name, func)
-+                menu.addAction(_('&Search in Current File'), sann)
-+                menu.addAction(_('Search in All &History'), sreq(all=True))
-             return menu
- 
-         menu.addSeparator()
-@@ -903,16 +899,11 @@ class HgFileView(QFrame):
-                 self.searchbar.show()
-             menu.addSeparator()
-             annsearchmenu = menu.addMenu(_('Search Selected Text'))
--            for name, func in [(_('In Current &File'), sann),
--                               (_('In &Current Revision'),
--                                sreq(rev='.')),
--                               (_('In &Original Revision'),
--                                sreq(rev=fctx.rev())),
--                               (_('In All &History'), sreq(all=True))]:
--                def add(name, func):
--                    action = annsearchmenu.addAction(name)
--                    action.triggered.connect(func)
--                add(name, func)
-+            annsearchmenu.addAction(_('In Current &File'), sann)
-+            annsearchmenu.addAction(_('In &Current Revision'), sreq(rev='.'))
-+            annsearchmenu.addAction(_('In &Original Revision'),
-+                                    sreq(rev=fctx.rev()))
-+            annsearchmenu.addAction(_('In All &History'), sreq(all=True))
- 
-         data = [hglib.tounicode(fctx.path()), fctx.rev(), line]
- 
-@@ -924,12 +915,8 @@ class HgFileView(QFrame):
-         origrev = fctx.rev()
-         anngotomenu = menu.addMenu(_('Go to'))
-         annviewmenu = menu.addMenu(_('View File at'))
--        for name, func, smenu in [(_('&Originating Revision'), annorig, anngotomenu),
--                           (_('&Originating Revision'), editorig, annviewmenu)]:
--            def add(name, func):
--                action = smenu.addAction(name)
--                action.triggered.connect(func)
--            add(name, func)
-+        anngotomenu.addAction(_('&Originating Revision'), annorig)
-+        annviewmenu.addAction(_('&Originating Revision'), editorig)
-         for pfctx in fctx.parents():
-             pdata = [hglib.tounicode(pfctx.path()), pfctx.changectx().rev(),
-                      line]
 update-useagent.diff
 cmdui-logdialog.diff
 backout-repoa.diff
-fv-extraclosure.diff
 scireadfile.diff
 rej-scireadfile.diff
 infobarclose.diff