Mercurial > hg > easyhg
comparison filestates.cpp @ 362:73fb5ef55744
Merge from branch "feature_91b". Really fixes #91
author | Chris Cannam |
---|---|
date | Thu, 17 Mar 2011 17:34:40 +0000 |
parents | 4cd753e083cc |
children |
comparison
equal
deleted
inserted
replaced
360:f34848e8094b | 362:73fb5ef55744 |
---|---|
142 Activities a; | 142 Activities a; |
143 | 143 |
144 switch (s) { | 144 switch (s) { |
145 | 145 |
146 case Modified: | 146 case Modified: |
147 a << Annotate << Diff << Commit << Revert << Remove; | 147 a << Annotate << Diff << Commit << Revert << Rename << Copy << Remove; |
148 break; | 148 break; |
149 | 149 |
150 case Added: | 150 case Added: |
151 a << Commit << Revert << Remove; | 151 a << Commit << Revert << Rename << Copy << Remove; |
152 break; | 152 break; |
153 | 153 |
154 case Removed: | 154 case Removed: |
155 a << Commit << Revert << Add; | 155 a << Commit << Revert << Add; |
156 break; | 156 break; |
166 case Unknown: | 166 case Unknown: |
167 a << Add << Ignore; | 167 a << Add << Ignore; |
168 break; | 168 break; |
169 | 169 |
170 case Clean: | 170 case Clean: |
171 a << Annotate << Remove; | 171 a << Annotate << Rename << Copy << Remove; |
172 break; | 172 break; |
173 | 173 |
174 case Ignored: | 174 case Ignored: |
175 a << UnIgnore; | 175 a << UnIgnore; |
176 break; | 176 break; |
187 int FileStates::activityGroup(Activity a) | 187 int FileStates::activityGroup(Activity a) |
188 { | 188 { |
189 switch (a) { | 189 switch (a) { |
190 case Annotate: case Diff: return 0; | 190 case Annotate: case Diff: return 0; |
191 case Commit: case Revert: return 1; | 191 case Commit: case Revert: return 1; |
192 case Add: case Remove: return 2; | 192 case Rename: case Copy: return 2; |
193 case RedoMerge: case MarkResolved: return 3; | 193 case Add: case Remove: return 3; |
194 case Ignore: case UnIgnore: return 4; | 194 case RedoMerge: case MarkResolved: return 4; |
195 case Ignore: case UnIgnore: return 5; | |
195 } | 196 } |
196 return 0; | 197 return 0; |
197 } | 198 } |
198 | 199 |
199 bool FileStates::supportsActivity(QString file, Activity a) const | 200 bool FileStates::supportsActivity(QString file, Activity a) const |