sapling/eden/scm/tests/test-histedit-mutation.t

#chg-compatible

  $ configure mutation
  $ . "$TESTDIR/histedit-helpers.sh"

  $ enable histedit rebase
  $ setconfig phases.publish=false
  $ readconfig <<EOF
  > [ui]
  > logtemplate= {rev}:{node|short} {desc|firstline}
  > EOF

Test that histedit learns about obsolescence not stored in histedit state
  $ hg init boo
  $ cd boo
  $ echo a > a
  $ hg ci -Am a
  adding a
  $ echo a > b
  $ echo a > c
  $ echo a > c
  $ hg ci -Am b
  adding b
  adding c
  $ echo a > d
  $ hg ci -Am c
  adding d
  $ echo "pick `hg log -r 0 -T '{node|short}'`" > plan
  $ echo "pick `hg log -r 2 -T '{node|short}'`" >> plan
  $ echo "edit `hg log -r 1 -T '{node|short}'`" >> plan
  $ hg histedit -r 'all()' --commands plan
  Editing (1b2d564fad96), you may commit or record as needed now.
  (hg histedit --continue to resume)
  [1]
  $ hg st
  A b
  A c
  ? plan
  $ hg commit --amend b
  $ hg histedit --continue
  $ hg log -G
  @  5:a7c0e6970599 b
  |
  o  4:f6ad57c4d86d c
  |
  o  0:cb9a9f314b8b a
  



  $ hg debugmutation -r "all()"
   *  cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
  
   *  f6ad57c4d86d7ab4eccce0ea15ad4ed707c7501b amend by test at 1970-01-01T00:00:00 from:
      36260dadec29b394783a666bb8103ee41ef31c29 histedit by test at 1970-01-01T00:00:00 from:
      114f4176969ef342759a8a57e6bccefc4234829b
  
   *  a7c0e697059912460046af2e00aafe7fe7ffb8db histedit by test at 1970-01-01T00:00:00 from:
      1b2d564fad96311b45362f17c2aa855150efb35f
  







With some node gone missing during the edit.

  $ echo "pick `hg log -r 0 -T '{node|short}'`" > plan
  $ echo "pick `hg log -r 5 -T '{node|short}'`" >> plan
  $ echo "edit `hg log -r 4 -T '{node|short}'`" >> plan
  $ hg histedit -r 'all()' --commands plan
  Editing (f6ad57c4d86d), you may commit or record as needed now.
  (hg histedit --continue to resume)
  [1]
  $ hg st
  A b
  A d
  ? plan
  $ hg commit --amend -X . -m XXXXXX
  $ hg commit --amend -X . -m b2
  $ hg --hidden debugstrip 'desc(XXXXXX)' --no-backup
  $ hg histedit --continue
  $ hg log -G
  @  8:54f3bb7ec5b2 c
  |
  o  7:12f834662cb1 b2
  |
  o  0:cb9a9f314b8b a
  



  $ hg debugmutation -r "all()"
   *  cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
  
   *  12f834662cb197db42bb7fd9d5bb517b46ccb913 amend by test at 1970-01-01T00:00:00 from:
      a9204699f34b2ac5d74b89f38d550ef653236d9b amend by test at 1970-01-01T00:00:00 from:
      9822bfbd0a4ea44a600b30cd46c5685b9ffa47f8 histedit by test at 1970-01-01T00:00:00 from:
      a7c0e697059912460046af2e00aafe7fe7ffb8db histedit by test at 1970-01-01T00:00:00 from:
      1b2d564fad96311b45362f17c2aa855150efb35f
  
   *  54f3bb7ec5b2361666b483a181f46a76dce055e0 histedit by test at 1970-01-01T00:00:00 from:
      f6ad57c4d86d7ab4eccce0ea15ad4ed707c7501b amend by test at 1970-01-01T00:00:00 from:
      36260dadec29b394783a666bb8103ee41ef31c29 histedit by test at 1970-01-01T00:00:00 from:
      114f4176969ef342759a8a57e6bccefc4234829b
  






  $ cd ..

Base setup for the rest of the testing
======================================

  $ hg init base
  $ cd base

  $ for x in a b c d e f ; do
  >     echo $x > $x
  >     hg add $x
  >     hg ci -m $x
  > done

  $ hg log --graph
  @  5:652413bf663e f
  |
  o  4:e860deea161a e
  |
  o  3:055a42cdd887 d
  |
  o  2:177f92b77385 c
  |
  o  1:d2ae7f538514 b
  |
  o  0:cb9a9f314b8b a
  




  $ HGEDITOR=cat hg histedit 1
  pick d2ae7f538514 1 b
  pick 177f92b77385 2 c
  pick 055a42cdd887 3 d
  pick e860deea161a 4 e
  pick 652413bf663e 5 f
  
  # Edit history between d2ae7f538514 and 652413bf663e
  #
  # Commits are listed from least to most recent
  #
  # You can reorder changesets by reordering the lines
  #
  # Commands:
  #
  #  e, edit = use commit, but stop for amending
  #  m, mess = edit commit message without changing commit content
  #  p, pick = use commit
  #  b, base = checkout changeset and apply further changesets from there
  #  d, drop = remove commit from history
  #  f, fold = use commit, but combine it with the one above
  #  r, roll = like fold, but discard this commit's description and date
  #



  $ hg histedit 1 --commands - --verbose <<EOF | grep histedit
  > pick 177f92b77385 2 c
  > drop d2ae7f538514 1 b
  > pick 055a42cdd887 3 d
  > fold e860deea161a 4 e
  > pick 652413bf663e 5 f
  > EOF
  [1]
  $ hg log --graph --hidden
  @  10:363adb0b332c f
  |
  o  9:e80cad0096a5 d
  |
  | x  8:7641852d682f fold-temp-revision e860deea161a
  | |
  | x  7:c04b72554bfd d
  |/
  o  6:dfac7d6bf3bc c
  |
  | x  5:652413bf663e f
  | |
  | x  4:e860deea161a e
  | |
  | x  3:055a42cdd887 d
  | |
  | x  2:177f92b77385 c
  | |
  | x  1:d2ae7f538514 b
  |/
  o  0:cb9a9f314b8b a
  



  $ hg debugmutation -r "all()"
   *  cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
  
   *  dfac7d6bf3bc0ef52e2721b05ea805990cba3627 histedit by test at 1970-01-01T00:00:00 from:
      177f92b773850b59254aa5e923436f921b55483b
  
   *  e80cad0096a561f253f8d9a465fb82ec5403f8b6 histedit by test at 1970-01-01T00:00:00 from:
      |-  c04b72554bfd2ad72e3fa8c23834904e7ab7d57c histedit by test at 1970-01-01T00:00:00 from:
      |   055a42cdd88768532f9cf79daa407fc8d138de9b
      '-  e860deea161a2f77de56603b340ebbb4536308ae
  
   *  363adb0b332ccf89563be10fb06d0c90f05fe2a8 histedit by test at 1970-01-01T00:00:00 from:
      652413bf663ef2a641cab26574e46d5f5a64a55a
  










Ensure hidden revision does not prevent histedit
-------------------------------------------------

create an hidden revision

  $ hg histedit 6 --commands - << EOF
  > pick dfac7d6bf3bc 6 c
  > drop e80cad0096a5 7 d
  > pick 363adb0b332c 8 f
  > EOF
  $ hg log --graph
  @  11:2a7423bdcce6 f
  |
  o  6:dfac7d6bf3bc c
  |
  o  0:cb9a9f314b8b a
  

check hidden revision are ignored (6 have hidden children 7 and 8)

  $ hg histedit 6 --commands - << EOF
  > pick dfac7d6bf3bc 6 c
  > pick 2a7423bdcce6 8 f
  > EOF



Test that rewriting leaving instability behind is allowed
---------------------------------------------------------------------

  $ hg up '.^'
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ hg log -r 'children(.)'
  11:2a7423bdcce6 f (no-eol)
  $ hg histedit -r '.' --commands - <<EOF
  > edit dfac7d6bf3bc 6 c
  > EOF
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  adding c
  Editing (dfac7d6bf3bc), you may commit or record as needed now.
  (hg histedit --continue to resume)
  [1]
  $ echo c >> c
  $ hg histedit --continue

  $ hg log -r '(obsolete()::) - obsolete()'
  11:2a7423bdcce6 f (no-eol)

stabilise

  $ hg rebase  -r '(obsolete()::) - obsolete()' -d .
  rebasing 2a7423bdcce6 "f"
  $ hg up tip -q

Test dropping of changeset on the top of the stack
-------------------------------------------------------

Nothing is rewritten below, the working directory parent must be change for the
dropped changeset to be hidden.

  $ cd ..
  $ hg clone base droplast
  updating to branch default
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cd droplast
  $ hg histedit -r '05d885d5bf7b' --commands - << EOF
  > pick 05d885d5bf7b 12 c
  > drop c3accca457aa 13 f
  > EOF
  $ hg log -G
  @  12:05d885d5bf7b c
  |
  o  0:cb9a9f314b8b a
  


With rewritten ancestors

  $ echo e > e
  $ hg add e
  $ hg commit -m g
  $ echo f > f
  $ hg add f
  $ hg commit -m h
  $ hg histedit -r '05d885d5bf7b' --commands - << EOF
  > pick 0ad9c053181f 12 g
  > pick 05d885d5bf7b 10 c
  > drop c9ce38eda099 13 h
  > EOF
  $ hg log -G
  @  17:14ea19c40480 c
  |
  o  16:64f466521de4 g
  |
  o  0:cb9a9f314b8b a
  

  $ cd ../base



Test phases support
===========================================

Check that histedit respect immutability
-------------------------------------------

  $ cat >> $HGRCPATH << EOF
  > [ui]
  > logtemplate= {rev}:{node|short} ({phase}) {desc|firstline}\n
  > EOF

  $ hg ph -pv '.^'
  $ hg log -G
  @  13:c3accca457aa (draft) f
  |
  o  12:05d885d5bf7b (public) c
  |
  o  0:cb9a9f314b8b (public) a
  

  $ hg histedit -r '.~2'
  abort: cannot edit public changeset: cb9a9f314b8b
  (see 'hg help phases' for details)
  [255]


Prepare further testing
-------------------------------------------

  $ for x in g h i j k ; do
  >     echo $x > $x
  >     hg add $x
  >     hg ci -m $x
  > done
  $ hg phase --force --secret .~2
  $ hg log -G
  @  18:4f4f997369d1 (secret) k
  |
  o  17:94556afb7287 (secret) j
  |
  o  16:af5689bd30fd (secret) i
  |
  o  15:49605d76b1f7 (draft) h
  |
  o  14:bd6d43595d7e (draft) g
  |
  o  13:c3accca457aa (draft) f
  |
  o  12:05d885d5bf7b (public) c
  |
  o  0:cb9a9f314b8b (public) a
  

  $ cd ..

simple phase conservation
-------------------------------------------

Resulting changeset should conserve the phase of the original one whatever the
phases.new-commit option is.

New-commit as draft (default)

  $ cp -R base simple-draft
  $ cd simple-draft
  $ hg histedit -r 'c3accca457aa' --commands - << EOF
  > edit c3accca457aa 13 f
  > pick bd6d43595d7e 14 g
  > pick 49605d76b1f7 15 h
  > pick af5689bd30fd 16 i
  > pick 94556afb7287 17 j
  > pick 4f4f997369d1 18 k
  > EOF
  0 files updated, 0 files merged, 6 files removed, 0 files unresolved
  adding f
  Editing (c3accca457aa), you may commit or record as needed now.
  (hg histedit --continue to resume)
  [1]
  $ echo f >> f
  $ hg histedit --continue
  $ hg log -G
  @  24:1313fc35db52 (secret) k
  |
  o  23:b361034ee87c (secret) j
  |
  o  22:c17eeb2f6c3d (secret) i
  |
  o  21:5af825d0adbb (draft) h
  |
  o  20:152765193a02 (draft) g
  |
  o  19:6263e4f96392 (draft) f
  |
  o  12:05d885d5bf7b (public) c
  |
  o  0:cb9a9f314b8b (public) a
  

  $ cd ..


New-commit as secret (config)

  $ cp -R base simple-secret
  $ cd simple-secret
  $ cat >> .hg/hgrc << EOF
  > [phases]
  > new-commit=secret
  > EOF
  $ hg histedit -r 'c3accca457aa' --commands - << EOF
  > edit c3accca457aa 13 f
  > pick bd6d43595d7e 14 g
  > pick 49605d76b1f7 15 h
  > pick af5689bd30fd 16 i
  > pick 94556afb7287 17 j
  > pick 4f4f997369d1 18 k
  > EOF
  0 files updated, 0 files merged, 6 files removed, 0 files unresolved
  adding f
  Editing (c3accca457aa), you may commit or record as needed now.
  (hg histedit --continue to resume)
  [1]
  $ echo f >> f
  $ hg histedit --continue
  $ hg log -G
  @  24:1313fc35db52 (secret) k
  |
  o  23:b361034ee87c (secret) j
  |
  o  22:c17eeb2f6c3d (secret) i
  |
  o  21:5af825d0adbb (draft) h
  |
  o  20:152765193a02 (draft) g
  |
  o  19:6263e4f96392 (draft) f
  |
  o  12:05d885d5bf7b (public) c
  |
  o  0:cb9a9f314b8b (public) a
  

  $ cd ..


Changeset reordering
-------------------------------------------

If a secret changeset is put before a draft one, all descendant should be secret.
It seems more important to present the secret phase.

  $ cp -R base reorder
  $ cd reorder
  $ hg histedit -r 'c3accca457aa' --commands - << EOF
  > pick c3accca457aa 13 f
  > pick 94556afb7287 17 j
  > pick bd6d43595d7e 14 g
  > pick af5689bd30fd 16 i
  > pick 49605d76b1f7 15 h
  > pick 4f4f997369d1 18 k
  > EOF
  $ hg log -G
  @  23:95954b6703e4 (secret) k
  |
  o  22:6e5aa76b47ae (secret) h
  |
  o  21:1860071fdf5a (secret) i
  |
  o  20:a99e43195f40 (secret) g
  |
  o  19:532ea2540383 (secret) j
  |
  o  13:c3accca457aa (draft) f
  |
  o  12:05d885d5bf7b (public) c
  |
  o  0:cb9a9f314b8b (public) a
  

  $ cd ..

Changeset folding
-------------------------------------------

Folding a secret changeset with a draft one turn the result secret (again,
better safe than sorry). Folding between same phase changeset still works

Note that there is a few reordering in this series for more extensive test

  $ cp -R base folding
  $ cd folding
  $ cat >> .hg/hgrc << EOF
  > [phases]
  > new-commit=secret
  > EOF
  $ hg histedit -r 'c3accca457aa' --commands - << EOF
  > pick 49605d76b1f7 15 h
  > fold c3accca457aa 13 f
  > pick bd6d43595d7e 14 g
  > fold 94556afb7287 17 j
  > pick af5689bd30fd 16 i
  > fold 4f4f997369d1 18 k
  > EOF
  $ hg log -G
  @  27:9132403f8032 (secret) i
  |
  o  24:ed9973fd7393 (secret) g
  |
  o  21:81d8ddd48bb3 (draft) h
  |
  o  12:05d885d5bf7b (public) c
  |
  o  0:cb9a9f314b8b (public) a
  

  $ hg co ed9973fd7393
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
  $ echo wat >> wat
  $ hg add wat
  $ hg ci -m 'add wat'
  $ hg merge 9132403f8032
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)
  $ hg ci -m 'merge'
  $ echo not wat > wat
  $ hg ci -m 'modify wat'
  $ hg histedit 81d8ddd48bb3
  abort: cannot edit history that contains merges
  [255]
  $ cd ..

Check abort behavior
-------------------------------------------

We checks that abort properly clean the repository so the same histedit can be
attempted later.

  $ cp -R base abort
  $ cd abort
  $ hg histedit -r 'c3accca457aa' --commands - << EOF
  > pick c3accca457aa 13 f
  > pick 49605d76b1f7 15 h
  > pick bd6d43595d7e 14 g
  > pick af5689bd30fd 16 i
  > roll 94556afb7287 17 j
  > edit 4f4f997369d1 18 k
  > EOF
  Editing (4f4f997369d1), you may commit or record as needed now.
  (hg histedit --continue to resume)
  [1]

  $ hg histedit --abort
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg log -G
  @  18:4f4f997369d1 (secret) k
  |
  o  17:94556afb7287 (secret) j
  |
  o  16:af5689bd30fd (secret) i
  |
  o  15:49605d76b1f7 (draft) h
  |
  o  14:bd6d43595d7e (draft) g
  |
  o  13:c3accca457aa (draft) f
  |
  o  12:05d885d5bf7b (public) c
  |
  o  0:cb9a9f314b8b (public) a
  


  $ hg histedit -r 'c3accca457aa' --commands - << EOF --config experimental.evolution.track-operation=1
  > pick c3accca457aa 13 f
  > pick 49605d76b1f7 15 h
  > pick bd6d43595d7e 14 g
  > pick af5689bd30fd 16 i
  > pick 94556afb7287 17 j
  > edit 4f4f997369d1 18 k
  > EOF
  Editing (4f4f997369d1), you may commit or record as needed now.
  (hg histedit --continue to resume)
  [1]
  $ hg histedit --continue --config experimental.evolution.track-operation=1
  $ hg log -G
  @  25:dd9cf9176a2d (secret) k
  |
  o  24:1380d026a7bb (secret) j
  |
  o  21:9f336d5d47c2 (secret) i
  |
  o  20:55f4840bfff6 (draft) g
  |
  o  19:c679430403c0 (draft) h
  |
  o  13:c3accca457aa (draft) f
  |
  o  12:05d885d5bf7b (public) c
  |
  o  0:cb9a9f314b8b (public) a
  

  $ hg debugmutation
   *  dd9cf9176a2deef0faf6fcf8a3901f2cf9e596bb histedit by test at 1970-01-01T00:00:00 from:
      4f4f997369d15ed5b8b8400375c76d9952dbc3cd