Mercurial > hg > easyhg
comparison hgaction.h @ 296:d40294e164da status_outside_tabs
Merge from the default branch
author | Chris Cannam |
---|---|
date | Tue, 22 Feb 2011 13:03:03 +0000 |
parents | 37f67999b661 |
children | 5b4aa1c24407 |
comparison
equal
deleted
inserted
replaced
287:3fbafca196e4 | 296:d40294e164da |
---|---|
41 ACT_PULL, | 41 ACT_PULL, |
42 ACT_CLONEFROMREMOTE, | 42 ACT_CLONEFROMREMOTE, |
43 ACT_INIT, | 43 ACT_INIT, |
44 ACT_COMMIT, | 44 ACT_COMMIT, |
45 ACT_ANNOTATE, | 45 ACT_ANNOTATE, |
46 ACT_UNCOMMITTED_SUMMARY, | |
46 ACT_DIFF_SUMMARY, | 47 ACT_DIFF_SUMMARY, |
47 ACT_FOLDERDIFF, | 48 ACT_FOLDERDIFF, |
48 ACT_CHGSETDIFF, | 49 ACT_CHGSETDIFF, |
49 ACT_UPDATE, | 50 ACT_UPDATE, |
50 ACT_REVERT, | 51 ACT_REVERT, |
60 { | 61 { |
61 HGACTIONS action; | 62 HGACTIONS action; |
62 QString workingDir; | 63 QString workingDir; |
63 QStringList params; | 64 QStringList params; |
64 QString executable; // empty for normal Hg, but gets filled in by hgrunner | 65 QString executable; // empty for normal Hg, but gets filled in by hgrunner |
66 void *extraData; | |
65 | 67 |
66 HgAction() : action(ACT_NONE) { } | 68 HgAction() : action(ACT_NONE) { } |
67 | 69 |
68 HgAction(HGACTIONS _action, QString _wd, QStringList _params) : | 70 HgAction(HGACTIONS _action, QString _wd, QStringList _params) : |
69 action(_action), workingDir(_wd), params(_params) { } | 71 action(_action), workingDir(_wd), params(_params), extraData(0) { } |
72 | |
73 HgAction(HGACTIONS _action, QString _wd, QStringList _params, void *_d) : | |
74 action(_action), workingDir(_wd), params(_params), extraData(_d) { } | |
70 | 75 |
71 bool operator==(const HgAction &a) { | 76 bool operator==(const HgAction &a) { |
72 return (a.action == action && a.workingDir == workingDir && | 77 return (a.action == action && a.workingDir == workingDir && |
73 a.params == params && a.executable == executable); | 78 a.params == params && a.executable == executable && |
79 a.extraData == extraData); | |
74 } | 80 } |
75 | 81 |
76 bool shouldBeFast() const { | 82 bool shouldBeFast() const { |
77 switch (action) { | 83 switch (action) { |
78 case ACT_NONE: | 84 case ACT_NONE: |