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

manifest: add subrepo support

Changeset 2fc9cb409d47…

Parent b18ca97eac6c…

by Angel Ezquerra

Changes to 3 files · Browse files at 2fc9cb409d47 Showing diff from parent b18ca97eac6c Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​manifestdialog.py Stacked
 
159
160
161
162
 
163
164
165
 
159
160
161
 
162
163
164
165
@@ -159,7 +159,7 @@
    def _initactions(self):   self._statusfilter = status.StatusFilterButton( - statustext='MAC', text=_('Status')) + statustext='MASC', text=_('Status'))   self._toolbar.addWidget(self._statusfilter)     self._actions = {}
Change 1 of 5 Show Changes Only tortoisehg/​hgqt/​manifestmodel.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
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
313
 # manifestmodel.py - Model for TortoiseHg manifest view  #  # Copyright (C) 2009-2010 LOGILAB S.A. <http://www.logilab.fr/>  # Copyright (C) 2010 Yuya Nishihara <yuya@tcha.org>  #  # 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.    import os, itertools    from PyQt4.QtCore import *  from PyQt4.QtGui import *    from mercurial import util  from tortoisehg.util import hglib  from tortoisehg.hgqt import qtlib, status, visdiff    class ManifestModel(QAbstractItemModel):   """   Qt model to display a hg manifest, ie. the tree of files at a   given revision. To be used with a QTreeView.   """     StatusRole = Qt.UserRole + 1   """Role for file change status"""   - def __init__(self, repo, rev, statusfilter='MAC', parent=None): + def __init__(self, repo, rev, statusfilter='MASC', parent=None):   QAbstractItemModel.__init__(self, parent)     self._repo = repo   self._rev = rev   - assert util.all(c in 'MARC' for c in statusfilter) + assert util.all(c in 'MARSC' for c in statusfilter)   self._statusfilter = statusfilter     def data(self, index, role=Qt.DisplayRole):   if not index.isValid():   return     if role == Qt.DecorationRole:   return self.fileIcon(index)   if role == self.StatusRole:   return self.fileStatus(index)     e = index.internalPointer()   if role == Qt.DisplayRole:   return e.name     def filePath(self, index):   """Return path at the given index [unicode]"""   if not index.isValid():   return ''     return index.internalPointer().path     def fileIcon(self, index):   ic = QApplication.style().standardIcon(   self.isDir(index) and QStyle.SP_DirIcon or QStyle.SP_FileIcon)   if not index.isValid():   return ic   e = index.internalPointer()   if not e.status:   return ic   st = status.statusTypes[e.status]   if st.icon:   ic = _overlaidicon(ic, qtlib.geticon(st.icon.rstrip('.ico'))) # XXX   return ic     def fileStatus(self, index):   """Return the change status of the specified file"""   if not index.isValid():   return   e = index.internalPointer()   return e.status     def isDir(self, index):   if not index.isValid():   return True # root entry must be a directory   e = index.internalPointer() - return len(e) != 0 + if e.status == 'S': + # Consider subrepos as dirs as well + return True + else: + return len(e) != 0     def mimeData(self, indexes):   def preparefiles():   files = [self.filePath(i) for i in indexes if i.isValid()]   if self._rev is not None:   base, _fns = visdiff.snapshot(self._repo, files,   self._repo[self._rev])   else: # working copy   base = self._repo.root   return iter(os.path.join(base, e) for e in files)     m = QMimeData()   m.setUrls([QUrl.fromLocalFile(e) for e in preparefiles()])   return m     def mimeTypes(self):   return ['text/uri-list']     def flags(self, index):   if not index.isValid():   return Qt.ItemIsEnabled   f = Qt.ItemIsEnabled | Qt.ItemIsSelectable   if not (self.isDir(index) or self.fileStatus(index) == 'R'):   f |= Qt.ItemIsDragEnabled   return f     def index(self, row, column, parent=QModelIndex()):   try:   return self.createIndex(row, column,   self._parententry(parent).at(row))   except IndexError:   return QModelIndex()     def indexFromPath(self, path, column=0):   """Return index for the specified path if found [unicode]     If not found, returns invalid index.   """   if not path:   return QModelIndex()     e = self._rootentry   paths = path and unicode(path).split('/') or []   try:   for p in paths:   e = e[p]   except KeyError:   return QModelIndex()     return self.createIndex(e.parent.index(e.name), column, e)     def parent(self, index):   if not index.isValid():   return QModelIndex()     e = index.internalPointer()   if e.path:   return self.indexFromPath(e.parent.path, index.column())   else:   return QModelIndex()     def _parententry(self, parent):   if parent.isValid():   return parent.internalPointer()   else:   return self._rootentry     def rowCount(self, parent=QModelIndex()):   return len(self._parententry(parent))     def columnCount(self, parent=QModelIndex()):   return 1     @pyqtSlot(str)   def setStatusFilter(self, status): - """Filter file tree by change status 'MARC'""" + """Filter file tree by change status 'MARSC'"""   status = str(status) - assert util.all(c in 'MARC' for c in status) + assert util.all(c in 'MARSC' for c in status)   if self._statusfilter == status:   return # for performance reason   self._statusfilter = status   self._buildrootentry()     @property   def statusFilter(self):   """Return the current status filter"""   return self._statusfilter     @property   def _rootentry(self):   try:   return self.__rootentry   except (AttributeError, TypeError):   self._buildrootentry()   return self.__rootentry     def _buildrootentry(self):   """Rebuild the tree of files and directories"""   roote = _Entry()   ctx = self._repo[self._rev]   + # Add subrepos to the tree + subpaths = ctx.substate.keys() + for path in subpaths: + if not 'S' in self._statusfilter: + break + e = roote + pathelements = hglib.tounicode(path).split('/') + for p in pathelements[:-1]: + if not p in e: + e.addchild(p) + e = e[p] + + p = pathelements[-1] + if not p in e: + e.addchild(p) + e = e[p] + e.setstatus('S') + + # Add regular files to the tree   status = dict(zip(('M', 'A', 'R'),   (set(a) for a in self._repo.status(ctx.parents()[0],   ctx)[:3])))   uncleanpaths = status['M'] | status['A'] | status['R']   def pathinstatus(path):   """Test path is included by the status filter"""   if util.any(c in self._statusfilter and path in e   for c, e in status.iteritems()):   return True   if 'C' in self._statusfilter and path not in uncleanpaths:   return True   return False     for path in itertools.chain(ctx.manifest(), status['R']):   if not pathinstatus(path):   continue     e = roote   for p in hglib.tounicode(path).split('/'):   if not p in e:   e.addchild(p)   e = e[p]     for st, files in status.iteritems():   if path in files:   # TODO: what if added & removed at once?   e.setstatus(st)   break   else:   e.setstatus('C')     roote.sort()     self.beginResetModel()   self.__rootentry = roote   self.endResetModel()    def _overlaidicon(base, overlay):   """Generate overlaid icon"""   # TODO: generalize this function as a utility   pixmap = base.pixmap(16, 16)   painter = QPainter(pixmap)   painter.setCompositionMode(QPainter.CompositionMode_SourceOver)   painter.drawPixmap(0, 0, overlay.pixmap(16, 16))   del painter   return QIcon(pixmap)    class _Entry(object):   """Each file or directory"""   def __init__(self, name='', parent=None):   self._name = name   self._parent = parent   self._status = None   self._child = {}   self._nameindex = []     @property   def parent(self):   return self._parent     @property   def path(self):   if self.parent is None or not self.parent.name:   return self.name   else:   return self.parent.path + '/' + self.name     @property   def name(self):   return self._name     @property   def status(self):   """Return file change status"""   return self._status     def setstatus(self, status): - assert status in 'MARC' + assert status in 'MARSC'   self._status = status     def __len__(self):   return len(self._child)     def __getitem__(self, name):   return self._child[name]     def addchild(self, name):   if name not in self._child:   self._nameindex.append(name)   self._child[name] = self.__class__(name, parent=self)     def __contains__(self, item):   return item in self._child     def at(self, index):   return self._child[self._nameindex[index]]     def index(self, name):   return self._nameindex.index(name)     def sort(self, reverse=False):   """Sort the entries recursively; directories first"""   for e in self._child.itervalues():   e.sort(reverse=reverse)   self._nameindex.sort(   key=lambda s: '%s%s' % (self[s] and 'D' or 'F', s),   reverse=reverse)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
782
783
784
785
 
786
787
788
 
782
783
784
 
785
786
787
788
@@ -782,7 +782,7 @@
  statusChanged = pyqtSignal(str)     def __init__(self, statustext, types=None, parent=None, **kwargs): - self._TYPES = 'MARC' + self._TYPES = 'MARSC'   if types is not None:   self._TYPES = types   #if 'text' not in kwargs: