diff hgaction.h @ 296:d40294e164da status_outside_tabs

Merge from the default branch

--- a/hgaction.h	Mon Feb 21 11:07:21 2011 +0000
+++ b/hgaction.h	Tue Feb 22 13:03:03 2011 +0000
@@ -43,6 +43,7 @@
     ACT_INIT,
     ACT_COMMIT,
     ACT_ANNOTATE,
+    ACT_UNCOMMITTED_SUMMARY,
     ACT_DIFF_SUMMARY,
     ACT_FOLDERDIFF,
     ACT_CHGSETDIFF,
@@ -62,15 +63,20 @@
     QString workingDir;
     QStringList params;
     QString executable; // empty for normal Hg, but gets filled in by hgrunner
+    void *extraData;
 
     HgAction() : action(ACT_NONE) { }
 
     HgAction(HGACTIONS _action, QString _wd, QStringList _params) :
-        action(_action), workingDir(_wd), params(_params) { }
+        action(_action), workingDir(_wd), params(_params), extraData(0) { }
+
+    HgAction(HGACTIONS _action, QString _wd, QStringList _params, void *_d) :
+        action(_action), workingDir(_wd), params(_params), extraData(_d) { }
 
     bool operator==(const HgAction &a) {
         return (a.action == action && a.workingDir == workingDir &&
-                a.params == params && a.executable == executable);
+                a.params == params && a.executable == executable &&
+                a.extraData == extraData);
     }
 
     bool shouldBeFast() const {