# HG changeset patch
# User Simon Heimberg <[email protected]>
# Date 1238088464 -3600
# Node ID 785bb368f46050e4064fa365857f38d076566f7d
# Parent 1009fcd7a521a7b999a0cc8c6aab467084a2d0ae
overlay nautilus: use new states
Icon for root directory and for unresolved files (after a merge)
diff -r 1009fcd7a521 -r 785bb368f460 contrib/nautilus-thg.py
--- a/contrib/nautilus-thg.py Fre Mär 27 17:45:22 2009 +0100
+++ b/contrib/nautilus-thg.py Don Mär 26 18:27:44 2009 +0100
@@ -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
------------------------------------------------------------------------------
_______________________________________________
Tortoisehg-develop mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
