comparison tests/test-evolve.t @ 3930:d00f0c369bc7 mercurial-4.4

test-compat: merge mercurial-4.5 into mercurial-4.4

3929:e709e3817d7e

  0	: base - test
  $ hg up -q 0
  $ glog --hidden
  o  4:ba0ec09b1bab@default(draft) a nifty feature
  |
  | *  3:6992c59c6b06@default(draft) another feature (child of 568a468b60fc)
  | |
  | | x  2:73296a82292a@default(draft) another feature (child of 568a468b60fc)
  | |/
  | x  1:568a468b60fc@default(draft) a nifty feature
  |/

(ninja test for the {trouble} template:

  $ hg log -G --template '{rev} {troubles}\n'
  @  10
  |
  | *  9 orphan
  | |
  | *  8 orphan
  | |
  | x  7
  |/
  o  5
  |

  $ hg up -r "desc('a2')"
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
  o  9 [default] a1__
  |
  | *  8 [mybranch] a3
  | |
  | @  7 [mybranch] a2
  | |
  | x  6 [default] a1_
  |/

  $ glog
  @  10:d952e93add6f@mybranch(draft) a2
  |
  o  9:9f8b83c2e7f3@default(draft) a1__
  |
  | *  8:777c26ca5e78@mybranch(draft) a3
  | |
  | x  7:eb07e22a0e63@mybranch(draft) a2
  | |
  | x  6:faafc6cea0ba@default(draft) a1_
  |/

  $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
  o  10 [mybranch] a2
  |
  @  9 [default] a1__
  |
  | *  8 [mybranch] a3
  | |
  | x  7 [mybranch] a2
  | |
  | x  6 [default] a1_
  |/

  |
  | o  10	: a2 - test
  |/
  o  9	testbookmark: a1__ - test
  |
  | *  8	: a3 - test
  | |
  | x  7	: a2 - test
  | |
  | x  6	: a1_ - test
  |/

  |
  | o  10	: a2 - test
  |/
  o  9	testbookmark: a1__ - test
  |
  | *  8	: a3 - test
  | |
  | x  7	: a2 - test
  | |
  | x  6	: a1_ - test
  |/

  $ hg amend
  2 new orphan changesets
  $ glog
  @  16:0cf3707e8971@default(draft) a3
  |
  | *  15:daa1ff1c7fbd@default(draft) add gh
  | |
  | | *  14:484fb3cfa7f2@default(draft) add gg
  | |/
  | x  13:b88539ad24d7@default(draft) a3
  |/
  o  12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f:
  |

  [255]

Shows "use 'hg evolve' to..." hints iff the evolve command is enabled

  $ hg --hidden up 14
  updating to a hidden changeset 484fb3cfa7f2
  (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272)
  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
  working directory parent is obsolete! (484fb3cfa7f2)
  $ cat >> $HGRCPATH <<EOF
  > [experimental]
  > evolutioncommands=evolve
  > EOF
  $ hg --hidden up 15
  updating to a hidden changeset daa1ff1c7fbd
  (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422)
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
  working directory parent is obsolete! (daa1ff1c7fbd)
  (use 'hg evolve' to update to its successor: 0c049e4e5422)

Restore all of the evolution features

  $ hg amend
  2 new orphan changesets
  $ glog -r "0cf3707e8971::"
  @  22:274b6cd0c101@default(draft) add j1
  |
  | *  21:89e4f7e8feb5@default(draft) add j3
  | |
  | *  20:4cd61236beca@default(draft) add j2
  | |
  | x  19:0fd8bfb02de4@default(draft) add j1
  |/
  | o  18:0c049e4e5422@default(draft) add gh
  | |

  new changeset is empty
  (use 'hg prune .' to remove it)
  $ glog -r "0cf3707e8971::"
  @  23:0ef9ff75f8e2@default(draft) add j1
  |
  | *  21:89e4f7e8feb5@default(draft) add j3
  | |
  | *  20:4cd61236beca@default(draft) add j2
  | |
  | x  19:0fd8bfb02de4@default(draft) add j1
  |/
  | o  18:0c049e4e5422@default(draft) add gh
  | |

  $ glog -r "0cf3707e8971::"
  @  32:c7dbf668e9d5@default(draft) _pp
  |
  o  31:2b5a32114b3d@default(draft) _oo
  |
  | *  30:4d122571f3b6@default(draft) add uu
  | |
  | x  29:7da3e73df8a5@default(draft) oo+pp
  |/
  | o  28:92ca6f3984de@default(draft) add gg
  | |

  $ glog -r "be23044af550::" --hidden
  @  38:61abd81de026@default(draft) will be evolved safely
  |
  o  37:df89d30f23e2@default(draft) amended
  |
  | *  36:59c37c5bebd1@default(draft) will cause conflict at evolve
  | |
  | x  35:7cc12c6c7862@default(draft) will be evolved safely
  | |
  | x  34:98c7ab460e6b@default(draft) will be amended
  |/

  $ hg log -GT "{rev}:{node|short} {desc} {bookmarks}\n"
  @  1:ab832e43dd5a added a
  
  $ hg up f7ad41964313 --hidden
  updating to a hidden changeset f7ad41964313
  (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a)
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  working directory parent is obsolete! (f7ad41964313)
  (use 'hg evolve' to update to its successor: ab832e43dd5a)

  $ hg bookmark book

3930:d00f0c369bc7

  0	: base - test
  $ hg up -q 0
  $ glog --hidden
  o  4:ba0ec09b1bab@default(draft) a nifty feature
  |
  | o  3:6992c59c6b06@default(draft) another feature (child of 568a468b60fc)
  | |
  | | x  2:73296a82292a@default(draft) another feature (child of 568a468b60fc)
  | |/
  | x  1:568a468b60fc@default(draft) a nifty feature
  |/

(ninja test for the {trouble} template:

  $ hg log -G --template '{rev} {troubles}\n'
  @  10
  |
  | o  9 orphan
  | |
  | o  8 orphan
  | |
  | x  7
  |/
  o  5
  |

  $ hg up -r "desc('a2')"
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
  o  9 [default] a1__
  |
  | o  8 [mybranch] a3
  | |
  | @  7 [mybranch] a2
  | |
  | x  6 [default] a1_
  |/

  $ glog
  @  10:d952e93add6f@mybranch(draft) a2
  |
  o  9:9f8b83c2e7f3@default(draft) a1__
  |
  | o  8:777c26ca5e78@mybranch(draft) a3
  | |
  | x  7:eb07e22a0e63@mybranch(draft) a2
  | |
  | x  6:faafc6cea0ba@default(draft) a1_
  |/

  $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
  o  10 [mybranch] a2
  |
  @  9 [default] a1__
  |
  | o  8 [mybranch] a3
  | |
  | x  7 [mybranch] a2
  | |
  | x  6 [default] a1_
  |/

  |
  | o  10	: a2 - test
  |/
  o  9	testbookmark: a1__ - test
  |
  | o  8	: a3 - test
  | |
  | x  7	: a2 - test
  | |
  | x  6	: a1_ - test
  |/

  |
  | o  10	: a2 - test
  |/
  o  9	testbookmark: a1__ - test
  |
  | o  8	: a3 - test
  | |
  | x  7	: a2 - test
  | |
  | x  6	: a1_ - test
  |/

  $ hg amend
  2 new orphan changesets
  $ glog
  @  16:0cf3707e8971@default(draft) a3
  |
  | o  15:daa1ff1c7fbd@default(draft) add gh
  | |
  | | o  14:484fb3cfa7f2@default(draft) add gg
  | |/
  | x  13:b88539ad24d7@default(draft) a3
  |/
  o  12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f:
  |

  [255]

Shows "use 'hg evolve' to..." hints iff the evolve command is enabled

  $ hg --hidden up 14
  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
  working directory parent is obsolete! (484fb3cfa7f2)
  $ cat >> $HGRCPATH <<EOF
  > [experimental]
  > evolutioncommands=evolve
  > EOF
  $ hg --hidden up 15
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
  working directory parent is obsolete! (daa1ff1c7fbd)
  (use 'hg evolve' to update to its successor: 0c049e4e5422)

Restore all of the evolution features

  $ hg amend
  2 new orphan changesets
  $ glog -r "0cf3707e8971::"
  @  22:274b6cd0c101@default(draft) add j1
  |
  | o  21:89e4f7e8feb5@default(draft) add j3
  | |
  | o  20:4cd61236beca@default(draft) add j2
  | |
  | x  19:0fd8bfb02de4@default(draft) add j1
  |/
  | o  18:0c049e4e5422@default(draft) add gh
  | |

  new changeset is empty
  (use 'hg prune .' to remove it)
  $ glog -r "0cf3707e8971::"
  @  23:0ef9ff75f8e2@default(draft) add j1
  |
  | o  21:89e4f7e8feb5@default(draft) add j3
  | |
  | o  20:4cd61236beca@default(draft) add j2
  | |
  | x  19:0fd8bfb02de4@default(draft) add j1
  |/
  | o  18:0c049e4e5422@default(draft) add gh
  | |

  $ glog -r "0cf3707e8971::"
  @  32:c7dbf668e9d5@default(draft) _pp
  |
  o  31:2b5a32114b3d@default(draft) _oo
  |
  | o  30:4d122571f3b6@default(draft) add uu
  | |
  | x  29:7da3e73df8a5@default(draft) oo+pp
  |/
  | o  28:92ca6f3984de@default(draft) add gg
  | |

  $ glog -r "be23044af550::" --hidden
  @  38:61abd81de026@default(draft) will be evolved safely
  |
  o  37:df89d30f23e2@default(draft) amended
  |
  | o  36:59c37c5bebd1@default(draft) will cause conflict at evolve
  | |
  | x  35:7cc12c6c7862@default(draft) will be evolved safely
  | |
  | x  34:98c7ab460e6b@default(draft) will be amended
  |/

  $ hg log -GT "{rev}:{node|short} {desc} {bookmarks}\n"
  @  1:ab832e43dd5a added a
  
  $ hg up f7ad41964313 --hidden
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  working directory parent is obsolete! (f7ad41964313)
  (use 'hg evolve' to update to its successor: ab832e43dd5a)

  $ hg bookmark book