Mercurial > evolve
view tests/test-evolve-noupdate.t @ 5816:a1dad44fe3da
tests: remove some unnecessary config
Some of these tests were originally split from a single file that had (and
used) these options, and some of the tests were later created by just
mindlessly copypasting the same set of options that aren't applicable to the
newly written tests.
Things removed by this patch:
- web section from tests that don't use hg serve and don't push
- phases.publish from tests that don't exchange changesets between repos
- diff section from tests that don't have any diffs
- defaults section that sets the date
The defaults section that only adds -d '0 0' to commands should no longer be
necessary because run-tests.py sets devel.default-date='0 0' since 4.3, and all
command in evolve should respect this config option.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Wed, 03 Mar 2021 10:57:09 +0800 |
parents | c5dfbbe4363d |
children | 29bc269bcc96 |
line wrap: on
line source
Testing the `--no-update` flag to `hg evolve` command ===================================================== There is an `--update` flag to `hg evolve` command which defaults to False. The `--update` flag updates to the head of the evolved revisions. If you don't want to change your working directory or update your working directory to its successor after hg evolve, `hg evolve --no-update` is the thing for you. This patch tests that flag. Setup ----- $ cat >> $HGRCPATH <<EOF > [alias] > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}" > [extensions] > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH #testcases inmemory ondisk #if inmemory $ cat >> $HGRCPATH <<EOF > [experimental] > evolution.in-memory = yes > EOF #endif $ hg init stoprepo $ cd stoprepo $ echo ".*\.orig" > .hgignore $ hg add .hgignore $ hg ci -m "added hgignore" $ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done; $ hg glog @ 4:c41c793e0ef1 added d | () draft o 3:ca1b80f7960a added c | () draft o 2:b1661037fa25 added b | () draft o 1:c7586e2a9264 added a | () draft o 0:8fa14d15e168 added hgignore () draft Making sure we stay where we were if current wdir parent was not obsoleted -------------------------------------------------------------------------- $ hg up .^^ 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ echo bar > b $ hg amend 2 new orphan changesets $ hg glog @ 5:7ed0642d644b added b | () draft | * 4:c41c793e0ef1 added d | | () draft | * 3:ca1b80f7960a added c | | () draft | x 2:b1661037fa25 added b |/ () draft o 1:c7586e2a9264 added a | () draft o 0:8fa14d15e168 added hgignore () draft There is no 'working directory is now at' message because we didn't update $ hg evolve --all --no-update move:[3] added c atop:[5] added b move:[4] added d $ hg glog o 7:b6b20b8eefdc added d | () draft o 6:7c46f743e62f added c | () draft @ 5:7ed0642d644b added b | () draft o 1:c7586e2a9264 added a | () draft o 0:8fa14d15e168 added hgignore () draft Updating to successor when working directory parent is obsoleted by evolution ----------------------------------------------------------------------------- $ hg prev 0 files updated, 0 files merged, 1 files removed, 0 files unresolved [1] added a $ echo bar > a $ hg amend 3 new orphan changesets $ hg up 7ed0642d644b 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg glog o 8:3d41537b44ca added a | () draft | * 7:b6b20b8eefdc added d | | () draft | * 6:7c46f743e62f added c | | () draft | @ 5:7ed0642d644b added b | | () draft | x 1:c7586e2a9264 added a |/ () draft o 0:8fa14d15e168 added hgignore () draft $ hg evolve --all --any --no-update move:[5] added b atop:[8] added a move:[6] added c move:[7] added d working directory is now at 12c720cb3782 $ hg glog o 11:a74d9f22ba3f added d | () draft o 10:958f5155e8cd added c | () draft @ 9:12c720cb3782 added b | () draft o 8:3d41537b44ca added a | () draft o 0:8fa14d15e168 added hgignore () draft