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

wctxactions: implement viewmissing and viewother methods

Changeset d9f84c04d83c…

Parent b38c3e6b4beb…

by Steve Borho

Changes to one file · Browse files at d9f84c04d83c Showing diff from parent b38c3e6b4beb Diff from another changeset...

Change 1 of 4 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
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
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
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
 # 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.    import os  import subprocess    from mercurial import util, cmdutil, error, merge, commands -from tortoisehg.hgqt import qtlib, htmlui +from tortoisehg.hgqt import qtlib, htmlui, visdiff  from tortoisehg.util import hglib, shlib  from tortoisehg.util.i18n import _    from PyQt4.QtCore import Qt, SIGNAL  from PyQt4.QtGui import QAction, QMenu, QMessageBox, QFileDialog    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, 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, parent, files, repo):   'run wrapper for all action methods'   hu = htmlui.htmlui()   name = func.__name__.title()   notify = False   cwd = os.getcwd()   os.chdir(repo.root)   try:   # All operations should quietly succeed. Any error should   # result in a message box   notify = func(parent, hu, repo, files)   o, e = hu.getdata()   if e:   QMessageBox.warning(parent, name + _(' reported errors'), str(e))   elif o:   QMessageBox.information(parent, name + _(' output'), str(o))   elif notify:   wfiles = [repo.wjoin(x) for x in files]   shlib.shell_notify(wfiles)   except (util.Abort, IOError, OSError), e:   QMessageBox.critical(parent, name + _(' Aborted'), str(e))   except (error.LookupError), e:   QMessageBox.critical(parent, name + _(' Aborted'), str(e))   except NotImplementedError:   QMessageBox.critical(parent, name + _(' not implemented'),   'Please add it :)')   os.chdir(cwd)   return notify    def vdiff(parent, ui, repo, files): - from tortoisehg.hgqt.visdiff import visualdiff - visualdiff(ui, repo, files, {}) + visdiff.visualdiff(ui, repo, files, {})    def edit(parent, ui, repo, files):   editor = (ui.config('tortoisehg', 'editor') or   ui.config('gtools', 'editor') or   os.environ.get('HGEDITOR') or   ui.config('ui', 'editor') or   os.environ.get('EDITOR', 'vi'))   if os.path.basename(editor) in ('vi', 'vim', 'hgeditor'):   res = QtGui.QMessageBox.critical(parent,   _('No visual editor configured'),   _('Please configure a visual editor.'))   #dlg = thgconfig.ConfigDialog(False, focus='tortoisehg.editor')   #dlg.exec_()   return     cmdline = ' '.join([editor] + [util.localpath(f) for f in files])   cmdline = util.quotecommand(cmdline)   try: - from tortoisehg.hgqt.visdiff import openflags - subprocess.Popen(cmdline, shell=True, creationflags=openflags, + subprocess.Popen(cmdline, shell=True, creationflags=visdiff.openflags,   stderr=None, stdout=None, stdin=None)   except (OSError, EnvironmentError), e:   QtGui.QMessageBox.warning(parent,   _('Editor launch failure'),   _('%s : %s') % (cmd, str(e)))   return False   +  def viewmissing(parent, ui, repo, files): - raise NotImplementedError() + base, _ = visdiff.snapshot(repo, files, repo['.']) + edit(parent, ui, repo, [os.path.join(base, f) for f in files])    def other(parent, ui, repo, files): - raise NotImplementedError() + wctx = repo[None] + assert bool(wctx.p2()) + base, _ = visdiff.snapshot(repo, files, wctx.p2()) + edit(parent, ui, repo, [os.path.join(base, f) for f in files])    def revert(parent, ui, repo, files):   revertopts = {'date': None, 'rev': '.'}     if len(repo.parents()) > 1:   res = qtlib.CustomPrompt(   _('Uncommited merge - please select a parent revision'),   _('Revert files to local or other parent?'), parent,   (_('&Local'), _('&Other'), ('&Cancel')), 0, 2, files).run()   if res == 0:   revertopts['rev'] = repo[None].p1().rev()   elif res == 1:   revertopts['rev'] = repo[None].p2().rev()   else:   return   commands.revert(ui, repo, *files, **revertopts)   else:   res = qtlib.CustomPrompt(   _('Confirm Revert'),   _('Revert changes to files?'), parent,   (_('&Yes (backup changes)'), _('Yes (&discard changes)'),   _('&Cancel')), 2, 2, files).run()   if res == 2:   return False   if res == 1:   revertopts['no_backup'] = True   commands.revert(ui, repo, *files, **revertopts)   return True    def log(parent, ui, repo, files):   raise NotImplementedError()    def forget(parent, ui, repo, files):   commands.forget(ui, repo, *files)   return True    def add(parent, ui, repo, files):   commands.add(ui, repo, *files)   return True    def guessRename(parent, ui, repo, files):   raise NotImplementedError()    def ignore(parent, ui, repo, files):   raise NotImplementedError()    def remove(parent, ui, repo, files):   commands.remove(ui, repo, *files)   return True    def delete(parent, ui, repo, files):   res = qtlib.CustomPrompt(   _('Confirm Delete Unrevisioned'),   _('Delete the following unrevisioned files?'),   parent, (_('&Delete'), _('&Cancel')), 1, 1, files).run()   if res == 1:   return   for wfile in files:   os.unlink(wfile)   return True    def copy(parent, ui, repo, files):   assert len(files) == 1   wfile = repo.wjoin(files[0])   fd = QFileDialog(parent)   fname = fd.getSaveFileName(parent, _('Copy file to'), wfile)   if not fname:   return   fname = hglib.fromunicode(fname)   wfiles = [wfile, fname]   commands.copy(ui, repo, *wfiles)   return True    def rename(parent, ui, repo, files):   # needs rename dialog   raise NotImplementedError()    def resolve(parent, ui, repo, files):   wctx = repo[None]   mctx = wctx.parents()[-1]   ms = merge.mergestate(repo)   for wfile in files:   ms.resolve(wfile, wctx, mctx)   return True    def unmark(parent, ui, repo, files):   ms = merge.mergestate(repo)   for wfile in files:   ms.mark(wfile, 'u')   return True    def mark(parent, ui, repo, files):   ms = merge.mergestate(repo)   for wfile in files:   ms.mark(wfile, 'r')   return True    def resolve_with(tool, repo, files):   oldmergeenv = os.environ.get('HGMERGE')   os.environ['HGMERGE'] = tool   resolve(None, None, repo, files)   if oldmergeenv:   os.environ['HGMERGE'] = oldmergeenv   else:   del os.environ['HGMERGE']   return True