comparison filestates.cpp @ 159:087d7cdde662

* Add InConflict state (not yet used)

 {
     m_modified.clear();
     m_added.clear();
     m_removed.clear();
     m_missing.clear();
+    m_inConflict.clear();
     m_unknown.clear();
 }
 
 FileStates::State FileStates::charToState(QChar c, bool *ok)
 {
+    // Note that InConflict does not correspond to a stat char -- it's
+    // reported separately, by resolve --list -- stat reports files in
+    // conflict as M which means they will appear in more than one bin
+    // if we handle them naively.
+
+    //!!! -- but InConflict isn't actually handled elsewhere, it's
+    //!!! -- only a placeholder really at the moment
     if (ok) *ok = true;
     if (c == 'M') return Modified;
     if (c == 'A') return Added;
     if (c == 'R') return Removed;
     if (c == '!') return Missing;

     case Modified: return &m_modified;
     case Added: return &m_added;
     case Unknown: return &m_unknown;
     case Removed: return &m_removed;
     case Missing: return &m_missing;
+    case InConflict: return &m_inConflict;
     }
 }
 
 void FileStates::parseStates(QString text)
 {

         bucket->push_back(file);
         m_stateMap[file] = s;
     }
 
     DEBUG << "FileStates: " << m_modified.size() << " modified, " << m_added.size()
-            << " added, " << m_removed.size() << " removed, " << m_missing.size()
-            << " missing, " << m_unknown.size() << " unknown" << endl;
+          << " added, " << m_removed.size() << " removed, " << m_missing.size()
+          << " missing, " << m_inConflict.size() << " in conflict, "
+          << m_unknown.size() << " unknown" << endl;
 }
 
 QStringList FileStates::getFilesInState(State s) const
 {
     QStringList *sl = const_cast<FileStates *>(this)->stateToBucket(s);