Clones.bjs

[gitlive] / Clones.js

diff --git a/Clones.js b/Clones.js
index 553a8ad..6f64404 100644 (file)
--- a/Clones.js
+++ b/Clones.js
@@ -361,6 +361,7 @@ Clones=new XObject({
                                             
                                             //print(JSON.stringify(ret,null,4));
                                              tr[i].getBranches();
+                                             tr[i].getStatus();
                                              var hi;
                                              try {
                                                  //tr[i].debug=1;
@@ -381,7 +382,17 @@ Clones=new XObject({
                                             // highlight color.
                                             var cb = tr[i].currentBranch;
                                             //print(JSON.stringify(cb,null,4));
-                                            var col = cb.lastrev == cb.remoterev ? '#ffffff' : '#ff0000';
+                                            var col = '#ffffff';
+                                            if (cb.lastrev != cb.remoterev) {
+                                                col =  '#ff0000';
+                                            }
+                                            if (tr[i].hasLocalChanges) {
+                                                col =  '#0000ff';
+                                            }
+                                            if  ((cb.lastrev != cb.remoterev) && (tr[i].hasLocalChanges)) {
+                                                col =  '#ff00ff';
+                                            }
+                                            
                                             this.el.set_value(ret.iter, 7, col  );      
                                             
                                         }