Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 27121:b08c31cfc4b6
merge.applyupdates: add all actions returned from merge state
At the moment this is a no-op (the only actions defined are 'r', 'a' and 'g'),
but soon we're going to add other sorts of actions to the dictionary returned
from mergestate.actions().
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Mon, 23 Nov 2015 19:06:15 -0800 |
| parents | 2ce00de5cc0e |
| children | 77d760ba8dcd |
comparison
equal
deleted
inserted
replaced
| 27120:37edc8e5ed4f | 27121:b08c31cfc4b6 |
|---|---|
| 1149 updated += msupdated | 1149 updated += msupdated |
| 1150 merged += msmerged | 1150 merged += msmerged |
| 1151 removed += msremoved | 1151 removed += msremoved |
| 1152 | 1152 |
| 1153 extraactions = ms.actions() | 1153 extraactions = ms.actions() |
| 1154 for a in 'rag': | 1154 for k, acts in extraactions.iteritems(): |
| 1155 actions[a].extend(extraactions[a]) | 1155 actions[k].extend(acts) |
| 1156 | 1156 |
| 1157 progress(_updating, None, total=numupdates, unit=_files) | 1157 progress(_updating, None, total=numupdates, unit=_files) |
| 1158 | 1158 |
| 1159 return updated, merged, removed, unresolved | 1159 return updated, merged, removed, unresolved |
| 1160 | 1160 |