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

status: color rows by merge status

Changeset 489cddd65ca8…

Parent 0c3cd84a2168…

by Steve Borho

Changes to one file · Browse files at 489cddd65ca8 Showing diff from parent 0c3cd84a2168 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
247
248
249
 
 
250
251
252
 
306
307
308
309
 
 
 
 
310
311
312
 
247
248
249
250
251
252
253
254
 
308
309
310
 
311
312
313
314
315
316
317
@@ -247,6 +247,8 @@
  'I': 'status.ignored',   'C': 'status.clean',   'S': 'status.subrepo', + 'r': 'resolve.resolved', + 'u': 'resolve.unresolved',  }    colors = {} @@ -306,7 +308,10 @@
    checked, status, mst, upath, path = self.rows[index.row()]   if role == Qt.TextColorRole: - return colors.get(status, QColor('black')) + if mst: + return colors.get(mst.lower(), QColor('black')) + else: + return colors.get(status, QColor('black'))   elif role == Qt.ToolTipRole:   if status in tips:   tip = tips[status] % upath