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

status: fix name conflict between member function and variable

Changeset 48298f8c38f2…

Parent 42f6042675e8…

by Steve Borho

Changes to one file · Browse files at 48298f8c38f2 Showing diff from parent 42f6042675e8 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
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
 
156
157
158
159
160
161
 
162
163
164
 
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
 
156
157
158
 
 
 
159
160
161
162
@@ -124,31 +124,31 @@
  QAbstractTableModel.__init__(self)   data = []   for m in wctx.modified(): - data.append(('M', m)) + rows.append(('M', m))   for a in wctx.added(): - data.append(('A', a)) + rows.append(('A', a))   for r in wctx.removed(): - data.append(('R', r)) + rows.append(('R', r))   for d in wctx.deleted(): - data.append(('!', d)) + rows.append(('!', d))   for u in wctx.unknown(): - data.append(('?', u)) + rows.append(('?', u))   # TODO: wctx.ignored() does not exist   #for i in wctx.ignored(): - # data.append(('I', i)) + # rows.append(('I', i))   for c in wctx.clean(): - data.append(('C', c)) + rows.append(('C', c))   try:   for s in wctx.substate:   if wctx.sub(s).dirty(): - data.append(('S', s)) + rows.append(('S', s))   except (OSError, IOError, error.ConfigError), e:   self.status_error = str(e) - self.data = data + self.rows = rows   self.headers = (_('Stat'), _('Filename'))     def rowCount(self, parent): - return len(self.data) + return len(self.rows)     def columnCount(self, parent):   return 2 @@ -156,9 +156,7 @@
  def data(self, index, role):   if not index.isValid() or role != Qt.DisplayRole:   return QVariant() - if index.row() < 0 or index.row() >= len(self.data): - return QVariant() - return QVariant(self.data[index.row()][index.column()]) + return QVariant(self.rows[index.row()][index.column()])     def headerData(self, col, orientation, role):   if role != Qt.DisplayRole or orientation != Qt.Horizontal: