Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

overlay nautilus: use new states

Icon for root directory and for unresolved files (after a merge)

Changeset aaff0d60ad32…

Parent 3afaaff9252e…

by Simon Heimberg

Changes to one file · Browse files at aaff0d60ad32 Showing diff from parent 3afaaff9252e Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​nautilus-thg.py Stacked
 
261
262
263
264
 
 
 
265
266
267
 
261
262
263
 
264
265
266
267
268
269
@@ -261,7 +261,9 @@
  cachethg.MODIFIED: ('cvs-modified', 'modified'),   cachethg.UNKNOWN: ('new', 'unrevisioned'),   cachethg.IGNORED: (None, 'ignored'), - cachethg.NOT_IN_REPO: (None, '')} + cachethg.NOT_IN_REPO: (None, ''), + cachethg.ROOT: ('generic', 'root'), + cachethg.UNRESOLVED: ('cvs-confilict', 'unresolved')}   emblem, status = cache2state.get(cachestate, (None, '?'))   return emblem, status