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

Merge with stable

Changeset 2c0e887d8052…

Parents b4e308ec289f…

Parents 05bba35d2b7a…

by Steve Borho

Changes to 4 files · Browse files at 2c0e887d8052 Showing diff from parent b4e308ec289f 05bba35d2b7a Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​filedata.py Stacked
 
159
160
161
 
162
163
164
165
166
167
 
 
168
169
170
 
159
160
161
162
163
164
165
166
 
 
167
168
169
170
171
@@ -159,12 +159,13 @@
  subrepochange, sstatedesc = genSubrepoRevChangedDescription(sparent, srev)   out += subrepochange   else: + sstatedesc = 'dirty'   if srev != sactual:   subrepochange, sstatedesc = \   genSubrepoRevChangedDescription(srev, sactual)   out += subrepochange - if data: - sstatedesc += ' and dirty' + if data: + sstatedesc += ' and dirty'   self.contents = u''.join(out)   if not sactual:   sstatedesc = 'removed'
Change 1 of 3 Show Changes Only tortoisehg/​hgqt/​filelistview.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
242
243
 
 
 
 
 
 
 
 
 
 
 
 
244
245
 
246
247
248
 
 
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
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
245
246
247
248
249
250
251
252
253
 
254
255
 
 
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
 # Copyright (c) 2009-2010 LOGILAB S.A. (Paris, FRANCE).  # http://www.logilab.fr/ -- mailto:contact@logilab.fr  #  # This program is free software; you can redistribute it and/or modify it under  # the terms of the GNU General Public License as published by the Free Software  # Foundation; either version 2 of the License, or (at your option) any later  # version.  #  # This program is distributed in the hope that it will be useful, but WITHOUT  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS  # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.  #  # You should have received a copy of the GNU General Public License along with  # this program; if not, write to the Free Software Foundation, Inc.,  # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.    import os    from tortoisehg.util import hglib  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib, visdiff, revert -from tortoisehg.hgqt.filedialogs import FileLogDialog, FileDiffDialog +from tortoisehg.hgqt.filedialogs import FileLogDialog, FileDiffDialog    from PyQt4.QtCore import *  from PyQt4.QtGui import *    class HgFileListView(QTableView):   """   A QTableView for displaying a HgFileListModel   """     fileSelected = pyqtSignal(QString, QString)   clearDisplay = pyqtSignal() - contextmenu = None + filecontextmenu = None + subrepocontextmenu = None     def __init__(self, parent=None):   QTableView.__init__(self, parent)   self.setShowGrid(False)   self.horizontalHeader().hide()   self.verticalHeader().hide()   self.verticalHeader().setDefaultSectionSize(20)   self.setSelectionMode(QAbstractItemView.SingleSelection)   self.setSelectionBehavior(QAbstractItemView.SelectRows)   self.setTextElideMode(Qt.ElideLeft)     self.createActions()     self.doubleClicked.connect(self.fileActivated)   self._diff_dialogs = {}   self._nav_dialogs = {}     def setModel(self, model):   QTableView.setModel(self, model)   model.layoutChanged.connect(self.layoutChanged)   model.contextChanged.connect(self.contextChanged)   self.selectionModel().currentRowChanged.connect(self.onRowChange)   self.horizontalHeader().setResizeMode(1, QHeaderView.Stretch)   self.actionShowAllMerge.setChecked(False)   self.actionShowAllMerge.toggled.connect(model.toggleFullFileList)   if model._ctx is not None:   self.contextChanged(model._ctx)     def contextChanged(self, ctx):   real = type(ctx.rev()) is int   wd = ctx.rev() is None   for act in ['navigate', 'diffnavigate', 'ldiff', 'edit']:   self._actions[act].setEnabled(real)   for act in ['diff', 'revert']:   self._actions[act].setEnabled(real or wd)   self.actionShowAllMerge.setEnabled(len(ctx.parents()) == 2)     def currentFile(self):   index = self.currentIndex()   return self.model().fileFromIndex(index)     def layoutChanged(self):   'file model has new contents'   index = self.currentIndex()   count = len(self.model())   if index.row() == -1:   # index is changing, onRowChange() called for us   self.selectRow(0)   elif index.row() >= count:   if count:   # index is changing, onRowChange() called for us   self.selectRow(count-1)   else:   self.clearDisplay.emit()   else:   # redisplay previous row   self.onRowChange(index)     def onRowChange(self, index, *args):   if index is None:   index = self.currentIndex()   data = self.model().dataFromIndex(index)   if data:   self.fileSelected.emit(hglib.tounicode(data['path']), data['status'])   else:   self.clearDisplay.emit()     def selectFile(self, filename):   'Select given file, if found, else the first file'   index = self.model().indexFromFile(filename)   if index:   if index != self.currentIndex():   self.setCurrentIndex(index)   else:   self.onRowChange(index)   elif self.model().count():   self.selectRow(0)     def fileActivated(self, index, alternate=False):   selFile = self.model().fileFromIndex(index)   if alternate:   self.navigate(selFile)   else:   self.diffNavigate(selFile)     def navigate(self, filename=None):   self._navigate(filename, FileLogDialog, self._nav_dialogs)     def diffNavigate(self, filename=None):   self._navigate(filename, FileDiffDialog, self._diff_dialogs)     def vdiff(self):   filename = self.currentFile()   if filename is None:   return   model = self.model()   pats = [filename]   opts = {'change':model._ctx.rev()}   dlg = visdiff.visualdiff(model.repo.ui, model.repo, pats, opts)   if dlg:   dlg.exec_()     def vdifflocal(self):   filename = self.currentFile()   if filename is None:   return   model = self.model()   pats = [filename]   assert type(model._ctx.rev()) is int   opts = {'rev':['rev(%d)' % (model._ctx.rev())]}   dlg = visdiff.visualdiff(model.repo.ui, model.repo, pats, opts)   if dlg:   dlg.exec_()     def editfile(self):   filename = self.currentFile()   if filename is None:   return   model = self.model()   repo = model.repo   rev = model._ctx.rev()   if rev is None:   qtlib.editfiles(repo, [filename], parent=self)   else:   base, _ = visdiff.snapshot(repo, [filename], repo[rev])   files = [os.path.join(base, filename)]   qtlib.editfiles(repo, files, parent=self)     def editlocal(self):   filename = self.currentFile()   if filename is None:   return   model = self.model()   repo = model.repo   qtlib.editfiles(repo, [filename], parent=self)     def revertfile(self):   filename = self.currentFile()   if filename is None:   return   model = self.model()   repo = model.repo   rev = model._ctx.rev()   if rev is None:   rev = model._ctx.p1().rev()   dlg = revert.RevertDialog(repo, filename, rev, self)   dlg.exec_()     def _navigate(self, filename, dlgclass, dlgdict):   if not filename:   filename = self.currentFile()   model = self.model()   if filename is not None and len(model.repo.file(filename))>0:   if filename not in dlgdict:   dlg = dlgclass(model.repo, filename,   repoviewer=self.window())   dlgdict[filename] = dlg   ufname = hglib.tounicode(filename)   dlg.setWindowTitle(_('Hg file log viewer - %s') % ufname)   dlg.setWindowIcon(qtlib.geticon('hg-log'))   dlg = dlgdict[filename]   dlg.goto(model._ctx.rev())   dlg.show()   dlg.raise_()   dlg.activateWindow()     def createActions(self):   self.actionShowAllMerge = QAction(_('Show All'), self)   self.actionShowAllMerge.setToolTip(   _('Toggle display of all files and the direction they were merged'))   self.actionShowAllMerge.setCheckable(True)   self.actionShowAllMerge.setChecked(False)     self._actions = {}   for name, desc, icon, key, tip, cb in [   ('navigate', _('File history'), 'hg-log', 'Shift+Return',   _('Show the history of the selected file'), self.navigate),   ('diffnavigate', _('Compare file revisions'), 'compare-files', None,   _('Compare revisions of the selected file'), self.diffNavigate),   ('diff', _('Visual Diff'), 'visualdiff', 'Ctrl+D',   _('View file changes in external diff tool'), self.vdiff),   ('ldiff', _('Visual Diff to Local'), 'ldiff', 'Shift+Ctrl+D',   _('View changes to current in external diff tool'),   self.vdifflocal),   ('edit', _('View at Revision'), 'view-at-revision', 'Alt+Ctrl+E',   _('View file as it appeared at this revision'), self.editfile),   ('ledit', _('Edit Local'), 'edit-file', 'Shift+Ctrl+E',   _('Edit current file in working copy'), self.editlocal),   ('revert', _('Revert to Revision'), 'hg-revert', 'Alt+Ctrl+T',   _('Revert file(s) to contents at this revision'),   self.revertfile),   ]:   act = QAction(desc, self)   if icon:   act.setIcon(qtlib.getmenuicon(icon))   if key:   act.setShortcut(key)   if tip:   act.setStatusTip(tip)   if cb:   act.triggered.connect(cb)   self._actions[name] = act   self.addAction(act)     def contextMenuEvent(self, event): - if not self.contextmenu: - self.contextmenu = QMenu(self) - for act in ['diff', 'ldiff', 'edit', 'ledit', 'revert', - 'navigate', 'diffnavigate']: + itemissubrepo = self.currentFile() in self.model()._ctx.substate.keys() + # Subrepos and regular items have different context menus + if itemissubrepo: + contextmenu = self.subrepocontextmenu + actionlist = [] + else: + contextmenu = self.filecontextmenu + actionlist = ['diff', 'ldiff', 'edit', 'ledit', 'revert', + 'navigate', 'diffnavigate'] + if not contextmenu: + contextmenu = QMenu(self) + for act in actionlist:   if act: - self.contextmenu.addAction(self._actions[act]) + contextmenu.addAction(self._actions[act])   else: - self.contextmenu.addSeparator() - self.contextmenu.exec_(event.globalPos()) + contextmenu.addSeparator() + contextmenu.exec_(event.globalPos())     def resizeEvent(self, event):   if self.model() is not None:   vp_width = self.viewport().width()   col_widths = [self.columnWidth(i) \   for i in range(1, self.model().columnCount())]   col_width = vp_width - sum(col_widths)   col_width = max(col_width, 50)   self.setColumnWidth(0, col_width)   QTableView.resizeEvent(self, event)     #   ## Mouse drag   #     def selectedRows(self):   return self.selectionModel().selectedRows()     def dragObject(self):   ctx = self.model()._ctx   if type(ctx.rev()) == str:   return   paths = []   for index in self.selectedRows():   paths.append(self.model().fileFromIndex(index))   if not paths:   return   if ctx.rev() is None:   base = ctx._repo.root   else:   base, _ = visdiff.snapshot(ctx._repo, paths, ctx)   urls = []   for path in paths:   urls.append(QUrl.fromLocalFile(os.path.join(base, path)))   if urls:   d = QDrag(self)   m = QMimeData()   m.setUrls(urls)   d.setMimeData(m)   d.start(Qt.CopyAction)     def mousePressEvent(self, event):   self.pressPos = event.pos()   self.pressTime = QTime.currentTime()   return QTableView.mousePressEvent(self, event)     def mouseMoveEvent(self, event):   d = event.pos() - self.pressPos   if d.manhattanLength() < QApplication.startDragDistance():   return QTableView.mouseMoveEvent(self, event)   elapsed = self.pressTime.msecsTo(QTime.currentTime())   if elapsed < QApplication.startDragTime():   return QTableView.mouseMoveEvent(self, event)   self.dragObject()   return QTableView.mouseMoveEvent(self, event)
Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
(No changes)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
417
418
419
420
 
421
422
423
 
417
418
419
 
420
421
422
423
@@ -417,7 +417,7 @@
  wctx.dirtySubrepos.append(s)   except EnvironmentError, e:   self.showMessage.emit(hglib.tounicode(str(e))) - except (error.RepoLookupError, error.ConfigError), e: + except (error.LookupError, error.RepoError, error.ConfigError), e:   self.showMessage.emit(hglib.tounicode(str(e)))   except util.Abort, e:   if e.hint: