Mercurial > hg > easyhg
comparison hgaction.h @ 307:5b4aa1c24407 new-branches-with-status-outside-tabs
Merge branch status_outside_tabs into branch new-branches, and make a new branch
author | Chris Cannam |
---|---|
date | Mon, 28 Feb 2011 13:09:37 +0000 |
parents | f7cdd5b31aed 37f67999b661 |
children | 4cd753e083cc |
comparison
equal
deleted
inserted
replaced
278:f7cdd5b31aed | 307:5b4aa1c24407 |
---|---|
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, |
61 { | 62 { |
62 HGACTIONS action; | 63 HGACTIONS action; |
63 QString workingDir; | 64 QString workingDir; |
64 QStringList params; | 65 QStringList params; |
65 QString executable; // empty for normal Hg, but gets filled in by hgrunner | 66 QString executable; // empty for normal Hg, but gets filled in by hgrunner |
67 void *extraData; | |
66 | 68 |
67 HgAction() : action(ACT_NONE) { } | 69 HgAction() : action(ACT_NONE) { } |
68 | 70 |
69 HgAction(HGACTIONS _action, QString _wd, QStringList _params) : | 71 HgAction(HGACTIONS _action, QString _wd, QStringList _params) : |
70 action(_action), workingDir(_wd), params(_params) { } | 72 action(_action), workingDir(_wd), params(_params), extraData(0) { } |
73 | |
74 HgAction(HGACTIONS _action, QString _wd, QStringList _params, void *_d) : | |
75 action(_action), workingDir(_wd), params(_params), extraData(_d) { } | |
71 | 76 |
72 bool operator==(const HgAction &a) { | 77 bool operator==(const HgAction &a) { |
73 return (a.action == action && a.workingDir == workingDir && | 78 return (a.action == action && a.workingDir == workingDir && |
74 a.params == params && a.executable == executable); | 79 a.params == params && a.executable == executable && |
80 a.extraData == extraData); | |
75 } | 81 } |
76 | 82 |
77 bool shouldBeFast() const { | 83 bool shouldBeFast() const { |
78 switch (action) { | 84 switch (action) { |
79 case ACT_NONE: | 85 case ACT_NONE: |