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

repotreeitem: unify mime-type of RepoItem and RepoGroupItem

Because they're both thg-reporegistry XML, it's good to use the same
mime-type.

Changeset 4ad01ebcf5f6…

Parent ecbb03034d0d…

by Yuya Nishihara

Changes to one file · Browse files at 4ad01ebcf5f6 Showing diff from parent ecbb03034d0d Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​repotreemodel.py Stacked
 
20
21
22
23
24
25
26
 
177
178
179
180
181
 
182
183
184
 
186
187
188
 
189
190
191
192
193
194
195
196
197
198
199
200
201
 
 
 
202
203
204
205
206
207
208
 
20
21
22
 
23
24
25
 
176
177
178
 
 
179
180
181
182
 
184
185
186
187
188
 
189
190
 
191
192
193
194
195
 
 
 
196
197
198
199
200
201
 
202
203
204
@@ -20,7 +20,6 @@
 reporegistryXmlElementName = 'reporegistry'    repoRegMimeType = 'application/thg-reporegistry' -repoRegGroupMimeType = 'application/thg-reporegistrygroup'  repoExternalMimeType = 'text/uri-list'     @@ -177,8 +176,7 @@
  return res     def mimeTypes(self): - return QStringList([repoRegMimeType, repoRegGroupMimeType, - repoExternalMimeType]) + return QStringList([repoRegMimeType, repoExternalMimeType])     def mimeData(self, indexes):   i = indexes[0] @@ -186,23 +184,21 @@
  buf = QByteArray()   writeXml(buf, item, extractXmlElementName)   d = QMimeData() + d.setData(repoRegMimeType, buf)   if isinstance(item, RepoItem): - d.setData(repoRegMimeType, buf)   d.setUrls([QUrl.fromLocalFile(hglib.tounicode(item.rootpath()))])   else: - d.setData(repoRegGroupMimeType, buf)   d.setText(QString(item.name))   return d     def dropMimeData(self, data, action, row, column, parent):   group = parent.internalPointer() - if data.hasUrls(): - d = str(data.data(repoRegMimeType)) - else: + d = str(data.data(repoRegMimeType)) + if not data.hasUrls(): + # don't allow nesting of groups   row = parent.row()   group = self.rootItem   parent = QModelIndex() - d = str(data.data(repoRegGroupMimeType))   itemread = readXml(d, extractXmlElementName)   if itemread is None:   return False