touch: prompt the user for what to do with the revived changeset This patch improves our interface for reviving changesets. This patch makes touch not assume that the user wants to create divergence by default and gives a prompt instead. The prompt is skipped for changeset that have no living successor as no divergence would be created by reviving them anyway. To restore the previous behavior, one should now use the --allowdivergence flag. The prompt looks like: [10] <description> reviving this changeset will create divergence unless you make a duplicate. (a)llow divergence or (d)uplicate the changeset? a In further patches we will want to add one more choice to that prompt, for example having a marker between the old and revived nodes but no divergence displayed on the UI.

     1

  $ cat >> $HGRCPATH <<EOF

     2

  > [ui]

     3

  > logtemplate={rev}:{node|short}[{bookmarks}] ({obsolete}/{phase}) {desc|firstline}\n

     4

  > [extensions]

     5

  > EOF

     6

  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH

     7

     8

  $ mkcommit() {

     9

  >    echo "$1" > "$1"

    10

  >    hg add "$1"

    11

  >    hg ci -m "add $1"

    12

  > }

    13

    14

  $ hg init repo

    15

  $ cd repo

    16

  $ mkcommit a

    17

  $ mkcommit b

    18

    19

test disabling commands

    20

    21

  $ cat >> .hg/hgrc <<EOF

    22

  > [experimental]

    23

  > evolution=createmarkers

    24

  >   allowunstable

    25

  >   exchange

    26

  > EOF

    27

  $ hg prune | head -n 2

    28

  hg: unknown command 'prune'

    29

  Mercurial Distributed SCM

    30