Mercurial > evolve
view tests/test-import.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 | cc3e68120185 |
children | 9f42f819267b |
line wrap: on
line source
This feature requires mercurial 3.0 (and the `only()` revset is 3.0 specific) $ (hg help revset | grep '"only(' > /dev/null) || exit 80 Test creation of obsolescence marker by path import $ hg init auto-obsolete $ cd auto-obsolete $ echo '[extensions]' >> $HGRCPATH $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH $ echo A > a $ hg commit -Am A adding a $ echo B > b $ hg commit -Am B adding b $ hg up '.^' 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo C > c $ hg commit -Am C adding c created new head $ hg log -G @ changeset: 2:eb8dd0f31b51 | tag: tip | parent: 0:f2bbf19cf96d | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: C | | o changeset: 1:95b760afef3c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: B | o changeset: 0:f2bbf19cf96d user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: A (actual test) $ hg export 'desc(B)' | hg import - --obsolete applying patch from stdin $ hg log -G @ changeset: 3:00c49133f17e | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: B | o changeset: 2:eb8dd0f31b51 | parent: 0:f2bbf19cf96d | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: C | o changeset: 0:f2bbf19cf96d user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: A $ hg debugobsolete 95b760afef3c234ffb3f9fd391edcb36e60921a4 00c49133f17e5e5a52b6ef1b6d516c0e90b56d8a 0 (*) {'user': 'test'} (glob) $ hg rollback repository tip rolled back to revision 2 (undo import) working directory now based on revision 2 $ hg log -G @ changeset: 2:eb8dd0f31b51 | tag: tip | parent: 0:f2bbf19cf96d | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: C | | o changeset: 1:95b760afef3c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: B | o changeset: 0:f2bbf19cf96d user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: A $ hg debugobsolete