Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

wctxactions: pass parent widget to run function

to properly align any pop-up windows

Changeset a17277d023ec…

Parent 89373632bfbe…

by Steve Borho

Changes to one file · Browse files at a17277d023ec Showing diff from parent 89373632bfbe Diff from another changeset...

Change 1 of 3 Show Changes Only tortoisehg/​hgqt/​wctxactions.py Stacked
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
 
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
 
70
71
72
73
74
75
76
77
78
79
80
 
81
82
 
83
84
85
86
87
 
88
89
 
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
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
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
 
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
 
69
70
71
72
73
74
75
76
77
78
79
 
80
81
 
82
83
84
85
86
 
87
88
 
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
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
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
 # wctxactions.py - menu and responses for working copy files  #  # Copyright 2010 Steve Borho <steve@borho.org>  #  # This software may be used and distributed according to the terms of the  # GNU General Public License version 2, incorporated herein by reference.    from mercurial import util, cmdutil, error, merge, commands  from tortoisehg.hgqt import qtlib, htmlui  from tortoisehg.util import hglib, shlib  from tortoisehg.util.i18n import _    from PyQt4.QtCore import Qt, SIGNAL  from PyQt4.QtGui import QAction, QMenu, QMessageBox    def wctxactions(parent, point, repo, selrows):   if not selrows:   return   alltypes = set()   for t, path in selrows:   alltypes |= t     def make(text, func, types, icon=None):   files = [f for t, f in selrows if t & types]   if not files:   return None   action = menu.addAction(text)   if icon:   action.setIcon(icon) - action.wrapper = lambda files=files: run(func, files, repo) + action.wrapper = lambda files=files: run(func, parent, files, repo)   parent.connect(action, SIGNAL('triggered()'), action.wrapper)   return action     menu = QMenu(parent)   make(_('&Visual Diff'), vdiff, frozenset('MAR!'))   make(_('Edit'), edit, frozenset('MACI?'))   make(_('View missing'), viewmissing, frozenset('R!'))   if len(repo.parents()) > 1:   make(_('View other'), other, frozenset('MA'))   menu.addSeparator()   make(_('&Revert'), revert, frozenset('MAR!'))   menu.addSeparator()   make(_('L&og'), log, frozenset('MARC!'))   menu.addSeparator()   make(_('&Forget'), forget, frozenset('MAC!'))   make(_('&Add'), add, frozenset('I?'))   make(_('&Guess Rename...'), guessRename, frozenset('?!'))   make(_('&Ignore'), ignore, frozenset('?'))   make(_('Remove versioned'), remove, frozenset('C'))   make(_('&Delete unversioned'), delete, frozenset('?I'))   if len(selrows) == 1:   menu.addSeparator()   make(_('&Copy...'), copy, frozenset('MC'))   make(_('Rename...'), rename, frozenset('MC'))   menu.addSeparator()   make(_('Mark unresolved'), unmark, frozenset('r'))   make(_('Mark resolved'), mark, frozenset('u'))   f = make(_('Restart Merge...'), resolve, frozenset('u'))   if f:   files = [f for t, f in selrows if 'u' in t]   rmenu = QMenu(_('Restart merge with'))   for tool in hglib.mergetools(repo.ui):   action = rmenu.addAction(tool)   action.wrapper = lambda tool=tool: resolve_with(tool, repo, files)   parent.connect(action, SIGNAL('triggered()'), action.wrapper)   menu.addMenu(rmenu)   return menu.exec_(point)   -def run(func, files, repo): +def run(func, parent, files, repo):   'run wrapper for all action methods'   wfiles = [repo.wjoin(x) for x in files]   hu = htmlui.htmlui()   name = func.__name__.title()   try:   # All operations should quietly succeed. Any error should   # result in a message box   notify = func(hu, wfiles, repo)   o, e = hu.getdata()   if e: - QMessageBox.warning(None, name + _(' reported errors'), str(e)) + QMessageBox.warning(parent, name + _(' reported errors'), str(e))   elif o: - QMessageBox.information(None, name + _(' reported errors'), str(o)) + QMessageBox.information(parent, name + _(' reported errors'), str(o))   elif notify:   shlib.shell_notify(wfiles)   return notify   except (util.Abort, IOError, OSError), e: - QMessageBox.critical(None, name + _(' Aborted'), str(e)) + QMessageBox.critical(parent, name + _(' Aborted'), str(e))   except (error.LookupError), e: - QMessageBox.critical(None, name + _(' Aborted'), str(e)) + QMessageBox.critical(parent, name + _(' Aborted'), str(e))   return False    def filelist(files):   'utility function to present file list'   text = '\n'.join(files[:5])   if len(files) > 5:   text += ' ...\n'   return hglib.tounicode(text)    def vdiff(ui, repo, files):   raise NotImplementedError()    def edit(ui, repo, files):   raise NotImplementedError()    def viewmissing(ui, repo, files):   raise NotImplementedError()    def other(ui, repo, files):   raise NotImplementedError()    def revert(ui, repo, files):   raise NotImplementedError()   # Needs work   revertopts = {}     if len(repo.parents()) > 1:   res = QMessageBox.Question(   None,   _('Uncommited merge - please select a parent revision'),   _('Revert files to local or other parent?'),   (_('&Local'), _('&Other'), _('&Cancel')), 2).run()   if res == 0:   revertopts['rev'] = repo[None].p1().rev()   elif res == 1:   revertopts['rev'] = repo[None].p2().rev()   else:   return   response = None   else:   # response: 0=Yes, 1=Yes,no backup, 2=Cancel   revs = revertopts['rev']   if revs and type(revs) == list:   revertopts['rev'] = revs[0]   else:   revertopts['rev'] = str(self.stat.repo['.'].rev())   response = gdialog.CustomPrompt(_('Confirm Revert'),   _('Revert files to revision %s?\n\n%s') % (revertopts['rev'],   filelist(files)), self.stat, (_('&Yes (backup changes)'),   _('Yes (&discard changes)'),   _('&Cancel')), 2, 2).run()   if response in (None, 0, 1):   if response == 1:   revertopts['no_backup'] = True   commands.revert(ui, repo, *wfiles, **revertopts)   return True    def log(ui, repo, files):   raise NotImplementedError()    def forget(ui, repo, files):   commands.forget(ui, repo, *files)   return True    def add(ui, repo, files):   raise NotImplementedError()    def guessRename(ui, repo, files):   raise NotImplementedError()    def ignore(ui, repo, files):   raise NotImplementedError()    def remove(ui, repo, files):   commands.remove(ui, repo, *files)   return True    def delete(ui, repo, files):   raise NotImplementedError()    def copy(ui, repo, files):   raise NotImplementedError()    def rename(ui, repo, files):   raise NotImplementedError()    def resolve(ui, repo, files):   raise NotImplementedError()    def unmark(ui, repo, files):   raise NotImplementedError()    def mark(ui, repo, files):   raise NotImplementedError()    def resolve_with(tool, repo, files):   raise NotImplementedError()