view tests/test-touch.t @ 1634:9ae4e79a28f3

evolve--list: initial implementation

This implementation does not work with '-T json' since it needs multiple levels
of depth.

There is various small issue with the current data, the test coverage is a bit
low and the output is likely to change, but this is a good step forward.

Sample output:

  01a3e66ba030: e (amended)
    unstable: 1995fc658ad6 (unstable parent)
    divergent: 84e1c6ae319d d3b90e9c84ab (precursor 3efa43a7427b)
    divergent: add9a356b8cf (precursor 3efa43a7427b)

  add9a356b8cf: e (rebased)
    divergent: 84e1c6ae319d d3b90e9c84ab (precursor 3efa43a7427b)
    divergent: 01a3e66ba030 (precursor 3efa43a7427b)

  84e1c6ae319d: e (e+f split)
    unstable: 1995fc658ad6 (unstable parent)
    divergent: 01a3e66ba030 (precursor 3efa43a7427b)
    divergent: add9a356b8cf (precursor 3efa43a7427b)

  d3b90e9c84ab: f (e+f split)
    unstable: 84e1c6ae319d (unstable parent)
    divergent: 01a3e66ba030 (precursor 3efa43a7427b)
    divergent: add9a356b8cf (precursor 3efa43a7427b)

  8febfaee0dd1: c
    unstable: 43765473b851 (obsolete parent)
    bumped: b36d99df9f41 (immutable precursor)

  1995fc658ad6: d: commit with a long happy message, ababagalamaga, ababagal...
    unstable: 8febfaee0dd1 (unstable parent)

  fa8498ad030f: aa
   unstable: d3b90e9c84ab (unstable parent)

  $ cat >> $HGRCPATH <<EOF
  > [ui]
  > logtemplate={rev}:{node|short} {desc}\n
  > [defaults]
  > amend=-d "0 0"
  > [extensions]
  > hgext.rebase=
  > EOF
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH

  $ hg init repo
  $ cd repo
  $ echo A > a
  $ hg add a
  $ hg commit -m a

Basic usage

  $ hg log -G
  @  0:e93df3427f45 a
  
  $ hg touch .
  $ hg log -G
  @  1:[0-9a-f]{12} a (re)
  


Revive usage

  $ echo A > b
  $ hg add b
  $ hg commit -m ab --amend
  $ hg up --hidden 1
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  working directory parent is obsolete!
  (use "hg evolve" to update to its successor)
  $ hg log -G
  o  3:[0-9a-f]{12} ab (re)
  
  @  1:[0-9a-f]{12} a (re)
  
  $ hg touch .
  [1] a
  reviving this changeset will create divergence unless you make a duplicate.
  (a)llow divergence or (d)uplicate the changeset?  a
  2 new divergent changesets
  $ hg log -G
  @  4:[0-9a-f]{12} a (re)
  
  o  3:[0-9a-f]{12} ab (re)
  
  $ hg prune 3
  1 changesets pruned

Duplicate

  $ hg touch --duplicate .
  $ hg log -G
  @  5:[0-9a-f]{12} a (re)
  
  o  4:[0-9a-f]{12} a (re)
  

Multiple touch

  $ echo C > c
  $ hg add c
  $ hg commit -m c
  $ echo D > d
  $ hg add d
  $ hg commit -m d
  $ hg log -G
  @  7:[0-9a-f]{12} d (re)
  |
  o  6:[0-9a-f]{12} c (re)
  |
  o  5:[0-9a-f]{12} a (re)
  
  o  4:[0-9a-f]{12} a (re)
  
  $ hg touch 6:7
  $ hg log -G
  @  9:[0-9a-f]{12} d (re)
  |
  o  8:[0-9a-f]{12} c (re)
  |
  o  5:[0-9a-f]{12} a (re)
  
  o  4:[0-9a-f]{12} a (re)
  

check move data kept after rebase on touch:

  $ touch gna1
  $ hg commit -Am gna1
  adding gna1
  $ hg mv gna1 gna2
  $ hg commit -m move
  $ hg st -C --change=tip
  A gna2
    gna1
  R gna1
  $ hg up .^
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ hg touch
  1 new unstable changesets

  $ hg rebase -s 11 -d 12
  rebasing 11:* "move" (glob)
  $ hg st -C --change=tip
  A gna2
    gna1
  R gna1

check that the --duplicate option does not create divergence

  $ hg touch --duplicate 11 --hidden
  1 new unstable changesets

check that reviving a changeset with no successor does not show the prompt

  $ hg prune 14
  1 changesets pruned
  $ hg touch 14 --hidden
  1 new unstable changesets