Mercurial > evolve
comparison tests/test-evolve-order.t @ 4122:4eb3877540f1
evovle: remove redundancy in evolve output
Copying the discription of this redundancy issue given by Pierre Yves David:
When running `hg evolve` to stabilize orphan changeset output about the
currently stabilized changeset is issued. For example:
$ hg evolve
move:[3] a3
atop:[4] a2
working directory is now at 7c5649f73d11
This output can become quite repetitive when orphan are stabilized atop
each other. For example:
$ hg evolve --all
move:[8] dansk 2!
atop:[10] dansk!
merging main-file-1
move:[9] dansk 3!
atop:[11] dansk 2!
In this case it would be smoother to issue:
$ hg evolve --all
move:[8] dansk 2!
atop:[10] dansk!
merging main-file-1
move:[9] dansk 3!
Since we are moving "dansk 3!" atop the changeset we just stabilized.
When adding this be careful that we still want to issue the "atop" message
in various cases:
1. first changesets in a stack
2. when the orphan is not stabilized atop previous one
3. when using hg evolve --continue to resume an evolution
So, I have made the changes which also respect above listed three points.
And changes in tests/test-evovle*.t reflecting the changed behavior.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Fri, 21 Sep 2018 15:52:53 +0530 |
| parents | d3a17c67f85c |
| children | e268f7fd7839 b58e45aa9be2 |
comparison
equal
deleted
inserted
replaced
| 4120:eea339cf4d30 | 4122:4eb3877540f1 |
|---|---|
| 60 evolve --rev reorders the rev to solve instability, trivial case 2 revs wrong order | 60 evolve --rev reorders the rev to solve instability, trivial case 2 revs wrong order |
| 61 $ hg evolve --rev 'desc(_c) + desc(_b)' | 61 $ hg evolve --rev 'desc(_c) + desc(_b)' |
| 62 move:[2] add _b | 62 move:[2] add _b |
| 63 atop:[4] add _a | 63 atop:[4] add _a |
| 64 move:[3] add _c | 64 move:[3] add _c |
| 65 atop:[5] add _b | |
| 66 working directory is now at 52b8f9b04f83 | 65 working directory is now at 52b8f9b04f83 |
| 67 | 66 |
| 68 evolve --rev reorders the rev to solve instability. Harder case, obsolescence | 67 evolve --rev reorders the rev to solve instability. Harder case, obsolescence |
| 69 accross three stacks in growing rev numbers. | 68 accross three stacks in growing rev numbers. |
| 70 $ hg up "desc(_c)" | 69 $ hg up "desc(_c)" |
| 104 | 103 |
| 105 $ hg evolve --rev "orphan()" | 104 $ hg evolve --rev "orphan()" |
| 106 move:[10] bprime | 105 move:[10] bprime |
| 107 atop:[11] asecond | 106 atop:[11] asecond |
| 108 move:[6] add _c | 107 move:[6] add _c |
| 109 atop:[12] bprime | |
| 110 move:[7] add _d | 108 move:[7] add _d |
| 111 atop:[13] add _c | |
| 112 working directory is now at 739f18ac1d03 | 109 working directory is now at 739f18ac1d03 |
| 113 $ hg log -G | 110 $ hg log -G |
| 114 @ 14:739f18ac1d03@default(draft) add _d | 111 @ 14:739f18ac1d03@default(draft) add _d |
| 115 | | 112 | |
| 116 o 13:e5960578d158@default(draft) add _c | 113 o 13:e5960578d158@default(draft) add _c |
| 212 Cleanup | 209 Cleanup |
| 213 $ hg evolve --rev "(desc(_d)::)" | 210 $ hg evolve --rev "(desc(_d)::)" |
| 214 move:[17] add c3_ | 211 move:[17] add c3_ |
| 215 atop:[28] add c2prime | 212 atop:[28] add c2prime |
| 216 move:[18] add c4_ | 213 move:[18] add c4_ |
| 217 atop:[30] add c3_ | |
| 218 working directory is now at 35e7b797ace5 | 214 working directory is now at 35e7b797ace5 |
| 219 $ hg log -G -r "desc(_d)::" | 215 $ hg log -G -r "desc(_d)::" |
| 220 @ 31:35e7b797ace5@default(draft) add c4_ | 216 @ 31:35e7b797ace5@default(draft) add c4_ |
| 221 | | 217 | |
| 222 o 30:0b9488394e89@default(draft) add c3_ | 218 o 30:0b9488394e89@default(draft) add c3_ |