comparison tests/test-stabilize-order.t @ 1410:2c451fece7a6

evolve: unify revision handling and rework error message This changesets do a massive refactoring of the way evolve select changesets to be evolve. We now use a two stages approach: 1) read command line argument and produce a list of revision to evolve. 2) evolve all these revisions. This allow a much cleaner, robust and extensible code. In the process the error message issued when there is nothing to evolve have been updated to informs about other troubles in the repository and point at useful option to solve them. The 'update' case is handled independently at the start of the function.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 19 Jun 2015 14:26:33 -0700
parents 848a04c078c7
children 0b714c4ad9ff
comparison
equal deleted inserted replaced
1409:3276730e4b32 1410:2c451fece7a6
151 o 0:c471ef929e6a@default(draft) addroot 151 o 0:c471ef929e6a@default(draft) addroot
152 152
153 $ hg up 9 153 $ hg up 9
154 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 154 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
155 $ hg evolve -v 155 $ hg evolve -v
156 nothing to evolve here 156 nothing to evolve on current working copy parent
157 (1 troubled changesets, do you want --any ?) 157 (1 other unstable in the repository, do you want --any or --rev)
158 [2] 158 [2]
159 $ hg evolve --any -v 159 $ hg evolve --any -v
160 move:[9] addc 160 move:[9] addc
161 atop:[11] addb 161 atop:[11] addb
162 hg rebase -r 65095d7d0dd5 -d 036cf654e942 162 hg rebase -r 65095d7d0dd5 -d 036cf654e942
178 o 7:005fe5914f78@default(draft) adda 178 o 7:005fe5914f78@default(draft) adda
179 | 179 |
180 o 0:c471ef929e6a@default(draft) addroot 180 o 0:c471ef929e6a@default(draft) addroot
181 181
182 $ hg evolve --any -v 182 $ hg evolve --any -v
183 abort: no troubled changes in the specified revisions 183 no unstable changesets to evolve
184 [255] 184 [1]