Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1.1, 2.1.2, and tip

stable 2.1.1 wctxactions: give parent to transient menus (closes #716)

Changeset 65a385cf4238…

Parent e934dca90bb0…

by Steve Borho

Changes to one file · Browse files at 65a385cf4238 Showing diff from parent e934dca90bb0 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​wctxactions.py Stacked
 
113
114
115
116
 
117
118
119
120
121
 
122
123
124
125
126
127
128
 
129
130
131
132
133
 
134
135
136
 
113
114
115
 
116
117
118
119
120
121
122
123
124
125
126
127
128
 
129
130
131
132
133
134
135
136
137
138
@@ -113,24 +113,26 @@
  t, path = selrows[0]   wctx = self.repo[None]   if t & frozenset('?') and wctx.deleted(): - rmenu = QMenu(_('Was renamed from')) + rmenu = QMenu(_('Was renamed from'), self.parent())   for d in wctx.deleted()[:15]:   def mkaction(deleted):   a = rmenu.addAction(hglib.tounicode(deleted))   a.triggered.connect(lambda: renamefromto(repo, deleted, path))   mkaction(d) + menu.addSeparator()   menu.addMenu(rmenu)     # Add restart merge actions for resolved files   if alltypes & frozenset('u'):   f = make(_('Restart Merge...'), resolve, frozenset('u'))   files = [f for t, f in selrows if 'u' in t] - rmenu = QMenu(_('Restart merge with')) + rmenu = QMenu(_('Restart merge with'), self.parent())   for tool in hglib.mergetools(repo.ui):   def mkaction(rtool):   a = rmenu.addAction(hglib.tounicode(rtool))   a.triggered.connect(lambda: resolve_with(rtool, repo, files))   mkaction(tool) + menu.addSeparator()   menu.addMenu(rmenu)   return menu