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

reporegistry: have the RepoTreeItem's know their model

and add an open() function, implemented by RepoItem.
Add self.openrepofunc to the model.

Fixes traceback when double-clicking a repo group item
(repo group items don't have a rootpath() function).

Changeset 5217783f0c34…

Parent d70a733d35f5…

by Adrian Buehlmann

Changes to one file · Browse files at 5217783f0c34 Showing diff from parent d70a733d35f5 Diff from another changeset...

Change 1 of 10 Show Entire File tortoisehg/​hgqt/​reporegistry.py Stacked
 
59
60
61
62
 
63
64
65
 
71
72
73
74
 
75
76
77
78
79
80
 
81
82
83
 
84
85
86
87
88
89
 
 
90
91
92
 
143
144
145
146
 
147
148
149
 
153
154
155
 
 
 
156
157
158
159
 
 
160
161
162
 
192
193
194
 
 
 
195
196
197
198
 
 
199
200
201
 
236
237
238
239
240
 
 
241
242
243
 
267
268
269
270
 
271
272
 
 
273
274
275
276
 
277
278
279
 
280
281
282
 
383
384
385
386
 
387
388
389
 
508
509
510
511
 
512
513
514
 
543
544
545
546
 
547
548
549
 
59
60
61
 
62
63
64
65
 
71
72
73
 
74
75
76
77
78
79
 
80
81
82
 
83
84
85
86
87
88
 
89
90
91
92
93
 
144
145
146
 
147
148
149
150
 
154
155
156
157
158
159
160
161
 
 
162
163
164
165
166
 
196
197
198
199
200
201
202
203
 
 
204
205
206
207
208
 
243
244
245
 
 
246
247
248
249
250
 
274
275
276
 
277
278
279
280
281
282
283
284
 
285
286
287
 
288
289
290
291
 
392
393
394
 
395
396
397
398
 
517
518
519
 
520
521
522
523
 
552
553
554
 
555
556
557
558
@@ -59,7 +59,7 @@
  xw.writeEndElement()   xw.writeEndDocument()   -def readXml(source, rootElementName): +def readXml(source, rootElementName, model):   itemread = None   xr = QtCore.QXmlStreamReader(source)   if xr.readNextStartElement(): @@ -71,22 +71,23 @@
  if xr.hasError():   print str(xr.errorString())   if xr.readNextStartElement(): - itemread = undumpObject(xr) + itemread = undumpObject(xr, model)   xr.skipCurrentElement()   if xr.hasError():   print str(xr.errorString())   return itemread   -def undumpObject(xr): +def undumpObject(xr, model):   classname = xmlToClass(str(xr.name().toString()))   class_ = getattr(sys.modules[RepoTreeItem.__module__], classname) - obj = class_() + obj = class_(model)   obj.undump(xr)   return obj      class RepoTreeItem: - def __init__(self, parent=None): + def __init__(self, model, parent=None): + self.model = model   self._parent = parent   self.childs = []   self._row = 0 @@ -143,7 +144,7 @@
  while not xr.atEnd():   xr.readNext()   if xr.isStartElement(): - item = undumpObject(xr) + item = undumpObject(xr, self.model)   self.appendChild(item)   elif xr.isEndElement():   break @@ -153,10 +154,13 @@
  self.dump(xw)   xw.writeEndElement()   + def open(self): + pass +    class RepoItem(RepoTreeItem): - def __init__(self, rootpath='', parent=None): - RepoTreeItem.__init__(self, parent) + def __init__(self, model, rootpath='', parent=None): + RepoTreeItem.__init__(self, model, parent)   self._root = rootpath     def rootpath(self): @@ -192,10 +196,13 @@
  self._root = str(a.value('', 'root').toString())   RepoTreeItem.undump(self, xr)   + def open(self): + self.model.openrepofunc(self._root) +    class RepoGroupItem(RepoTreeItem): - def __init__(self, name=None, parent=None): - RepoTreeItem.__init__(self, parent) + def __init__(self, model, name=None, parent=None): + RepoTreeItem.__init__(self, model, parent)   if name:   self.name = name   else: @@ -236,8 +243,8 @@
     class AllRepoGroupItem(RepoTreeItem): - def __init__(self, parent=None): - RepoTreeItem.__init__(self, parent) + def __init__(self, model, parent=None): + RepoTreeItem.__init__(self, model, parent)     def data(self, column, role):   if role == Qt.DecorationRole: @@ -267,16 +274,18 @@
     class RepoTreeModel(QtCore.QAbstractItemModel): - def __init__(self, fn=None, parent=None): + def __init__(self, openrepofunc, filename=None, parent=None):   QtCore.QAbstractItemModel.__init__(self, parent)   + self.openrepofunc = openrepofunc +   root = None   all = None   - if fn: + if filename:   f = QtCore.QFile(settingsfilename())   if f.open(QtCore.QIODevice.ReadOnly): - root = readXml(f, reporegistryXmlElementName) + root = readXml(f, reporegistryXmlElementName, self)   f.close()   if root:   for c in root.childs: @@ -383,7 +392,7 @@
  for s in data.formats():   print s   d = str(data.data(repoRegMimeType)) - itemread = readXml(d, extractXmlElementName) + itemread = readXml(d, extractXmlElementName, self)     group = parent.internalPointer()   cc = group.childCount() @@ -508,7 +517,7 @@
  def open(self):   if not self.selitem:   return - self.parent.openrepo(self.selitem.internalPointer().rootpath()) + self.selitem.internalPointer().open()     def newGroup(self):   m = self.model() @@ -543,7 +552,7 @@
  mainframe.setLayout(lay)   self.setWidget(mainframe)   - self.tmodel = m = RepoTreeModel(settingsfilename()) + self.tmodel = m = RepoTreeModel(self.openrepo, settingsfilename())     self.tview = tv = RepoTreeView(self)   lay.addWidget(tv)