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

repotreeitem: remove backref to RepoTreeModel

Changeset 06317f224d3b…

Parent ab0cca80751d…

by Yuya Nishihara

Changes to 2 files · Browse files at 06317f224d3b Showing diff from parent ab0cca80751d Diff from another changeset...

Change 1 of 7 Show Entire File tortoisehg/​hgqt/​repotreeitem.py Stacked
 
38
39
40
41
 
42
43
44
 
45
46
47
48
49
50
51
 
52
53
54
 
110
111
112
113
 
114
115
116
 
138
139
140
141
142
 
 
143
144
145
 
235
236
237
238
 
239
240
241
 
281
282
283
284
285
286
 
 
287
288
289
 
322
323
324
325
326
 
 
327
328
329
 
369
370
371
372
373
 
 
374
375
376
 
38
39
40
 
41
42
43
 
44
45
46
47
48
49
 
 
50
51
52
53
 
109
110
111
 
112
113
114
115
 
137
138
139
 
 
140
141
142
143
144
 
234
235
236
 
237
238
239
240
 
280
281
282
 
 
 
283
284
285
286
287
 
320
321
322
 
 
323
324
325
326
327
 
367
368
369
 
 
370
371
372
373
374
@@ -38,17 +38,16 @@
  inverseXmlClassMap[v] = k   return inverseXmlClassMap[classname]   -def undumpObject(xr, model): +def undumpObject(xr):   classname = xmlToClass(str(xr.name().toString()))   class_ = getattr(sys.modules[RepoTreeItem.__module__], classname) - obj = class_(model) + obj = class_()   obj.undump(xr)   return obj      class RepoTreeItem(object): - def __init__(self, model, parent=None): - self.model = model + def __init__(self, parent=None):   self._parent = parent   self.childs = []   self._row = 0 @@ -110,7 +109,7 @@
  while not xr.atEnd():   xr.readNext()   if xr.isStartElement(): - item = undumpObject(xr, self.model) + item = undumpObject(xr)   self.appendChild(item)   elif xr.isEndElement():   break @@ -138,8 +137,8 @@
     class RepoItem(RepoTreeItem): - def __init__(self, model, root=None, parent=None): - RepoTreeItem.__init__(self, model, parent) + def __init__(self, root=None, parent=None): + RepoTreeItem.__init__(self, parent)   self._root = root or ''   self._shortname = u''   self._basenode = node.nullid @@ -235,7 +234,7 @@
  abssubpath = repo.wjoin(subpath)   subtype = wctx.substate[subpath][2]   sriIsValid = os.path.isdir(abssubpath) - sri = SubrepoItem(self.model, abssubpath, subtype=subtype) + sri = SubrepoItem(abssubpath, subtype=subtype)   sri._valid = False   self.appendChild(sri)   @@ -281,9 +280,8 @@
  'svn': 'thg-svn-subrepo',   }   - def __init__(self, model, repo=None, parent=None, parentrepo=None, - subtype='hg'): - RepoItem.__init__(self, model, repo, parent) + def __init__(self, repo=None, parent=None, parentrepo=None, subtype='hg'): + RepoItem.__init__(self, repo, parent)   self._parentrepo = parentrepo   self._repotype = subtype   if self._repotype != 'hg': @@ -322,8 +320,8 @@
     class RepoGroupItem(RepoTreeItem): - def __init__(self, model, name=None, parent=None): - RepoTreeItem.__init__(self, model, parent) + def __init__(self, name=None, parent=None): + RepoTreeItem.__init__(self, parent)   if name:   self.name = name   else: @@ -369,8 +367,8 @@
     class AllRepoGroupItem(RepoGroupItem): - def __init__(self, model, parent=None): - RepoTreeItem.__init__(self, model, parent) + def __init__(self, parent=None): + RepoTreeItem.__init__(self, parent)   self.name = _('default')   def menulist(self):   return ['openAll', 'add', None, 'newGroup', None, 'rename',
Change 1 of 5 Show Entire File tortoisehg/​hgqt/​repotreemodel.py Stacked
 
38
39
40
41
 
42
43
44
 
50
51
52
53
 
54
55
56
57
58
59
 
60
61
62
63
64
 
65
66
67
 
90
91
92
93
 
94
95
96
 
210
211
212
213
 
214
215
216
 
247
248
249
250
 
251
252
253
 
38
39
40
 
41
42
43
44
 
50
51
52
 
53
54
55
56
57
58
 
59
60
61
62
63
 
64
65
66
67
 
90
91
92
 
93
94
95
96
 
210
211
212
 
213
214
215
216
 
247
248
249
 
250
251
252
253
@@ -38,7 +38,7 @@
  xw.writeEndElement()   xw.writeEndDocument()   -def readXml(source, rootElementName, model): +def readXml(source, rootElementName):   itemread = None   xr = QXmlStreamReader(source)   if xr.readNextStartElement(): @@ -50,18 +50,18 @@
  if xr.hasError():   print str(xr.errorString())   if xr.readNextStartElement(): - itemread = undumpObject(xr, model) + itemread = undumpObject(xr)   xr.skipCurrentElement()   if xr.hasError():   print str(xr.errorString())   return itemread   -def iterRepoItemFromXml(source, model=None): +def iterRepoItemFromXml(source):   xr = QXmlStreamReader(source)   while not xr.atEnd():   t = xr.readNext()   if t == QXmlStreamReader.StartElement and xr.name() == 'repo': - yield undumpObject(xr, model) + yield undumpObject(xr)    def getRepoItemList(root):   repoItemList = [] @@ -90,7 +90,7 @@
  if filename:   f = QFile(filename)   if f.open(QIODevice.ReadOnly): - root = readXml(f, reporegistryXmlElementName, self) + root = readXml(f, reporegistryXmlElementName)   f.close()   if root:   for c in root.childs: @@ -210,7 +210,7 @@
  group = self.rootItem   parent = QModelIndex()   d = str(data.data(repoRegGroupMimeType)) - itemread = readXml(d, extractXmlElementName, self) + itemread = readXml(d, extractXmlElementName)   if itemread is None:   return False   if group is None: @@ -247,7 +247,7 @@
  if row < 0:   row = rgi.childCount()   self.beginInsertRows(grp, row, row) - ri = RepoItem(self, root) + ri = RepoItem(root)   rgi.insertChild(row, ri)     if not self.showSubrepos \