comparison tests/test-obsolete.t @ 625:e291e5271694

prepare for Full scale filtering !!!

624:ce46d1624d4a

  > [web]
  > push_ssl = false
  > allow_push = *
  > [phases]
  > publish=False
  > [alias]
  > odiff=diff --rev 'limit(precursors(.),1)' --rev .
  > [extensions]
  > hgext.rebase=
  > EOF
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
  $ mkcommit() {
  >    echo "$1" > "$1"
  >    hg add "$1"
  >    hg ci -m "add $1"
  > }
  $ getid() {
  >    hg id --debug -ir "$1"
  > }

  $ alias qlog="hg log --template='{rev}\n- {node|short}\n'"
  $ hg init local
  $ cd local

  $ qlog -r 'allsuccessors(2)' --hidden
  3
  - 0d3f46688ccc
  4
  - 725c380fe99b
  $ hg up 3 -q
  Working directory parent is obsolete
  $ mkcommit d # 5 (on 3)
  1 new unstable changesets
  $ qlog -r 'obsolete()'
  3

  - 0d3f46688ccc
  1
  - 7c3bad9141dc
  0
  - 1f0dee641bb7
  $ hg up 3 -q
  Working directory parent is obsolete
  $ mkcommit obsol_d # 6
  created new head
  1 new unstable changesets
  $ hg debugobsolete `getid 5` `getid 6`

  pushing to ../other-new
  searching for changes
  no changes found
  [1]

  $ hg up -q .^ # 3
  Working directory parent is obsolete
  $ mkcommit "obsol_d'" # 7
  created new head
  1 new unstable changesets
  $ hg debugobsolete `getid 6` `getid 7`

  0
  - 1f0dee641bb7

Test rollback support

  $ hg up .^ -q # 3
  Working directory parent is obsolete
  $ mkcommit "obsol_d''"
  created new head
  1 new unstable changesets
  $ hg debugobsolete `getid 7` `getid 8`

  $ hg summary
  parent: 3:725c380fe99b 
   add obsol_c'
  branch: default
  commit: 1 deleted, 2 unknown (clean)
  update: 4 new changesets, 4 branch heads (merge)
  unstable: 1 changesets
  divergent: 1 changesets
  $ qlog
  6
  - 909a0fb57e5d

  

should not rebase extinct changeset

#excluded 'whole rebase set is extinct and ignored.' message not in core
  $ hg rebase -s 7 -d 4 2>&1 | grep -v 'whole rebase' 
  nothing to rebase
  $ hg rebase -b '3' -d 4 --traceback
  2 new divergent changesets
  $ hg log -G --template='{rev} - {node|short} {desc}\n'
  @  11 - 9468a5f5d8b2 add obsol_d''
  |

check bumped detection
(make an obsolete changeset public)

  $ cd local
  $ hg phase --public 11
  1 new bumped changesets
  $ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n'
  @  12 - (draft) 6db5e282cb91 add obsol_d'''
  |
  | o  11 - (public) 9468a5f5d8b2 add obsol_d''

  $ hg summary
  parent: 1[46]:50f11e5e3a63 tip (re)
   add obsolet_conflicting_d
  branch: default
  commit: (clean)
  update: (9|11) new changesets, (9|10) branch heads \(merge\) (re)
  bumped: 1 changesets
  $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
  $ hg log -r 'conflicting()'
  changeset:   12:6db5e282cb91
  parent:      10:2033b4e49474

625:e291e5271694

  > [web]
  > push_ssl = false
  > allow_push = *
  > [phases]
  > publish=False
  > [extensions]
  > hgext.rebase=
  > EOF
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
  $ mkcommit() {
  >    echo "$1" > "$1"
  >    hg add "$1"
  >    hg ci -m "add $1"
  > }
  $ getid() {
  >    hg id --hidden --debug -ir "$1"
  > }

  $ alias qlog="hg log --template='{rev}\n- {node|short}\n'"
  $ hg init local
  $ cd local

  $ qlog -r 'allsuccessors(2)' --hidden
  3
  - 0d3f46688ccc
  4
  - 725c380fe99b
  $ hg up --hidden 3 -q
  Working directory parent is obsolete
  $ mkcommit d # 5 (on 3)
  1 new unstable changesets
  $ qlog -r 'obsolete()'
  3

  - 0d3f46688ccc
  1
  - 7c3bad9141dc
  0
  - 1f0dee641bb7
  $ hg up --hidden 3 -q
  Working directory parent is obsolete
  $ mkcommit obsol_d # 6
  created new head
  1 new unstable changesets
  $ hg debugobsolete `getid 5` `getid 6`

  pushing to ../other-new
  searching for changes
  no changes found
  [1]

  $ hg up --hidden -q .^ # 3
  Working directory parent is obsolete
  $ mkcommit "obsol_d'" # 7
  created new head
  1 new unstable changesets
  $ hg debugobsolete `getid 6` `getid 7`

  0
  - 1f0dee641bb7

Test rollback support

  $ hg up --hidden .^ -q # 3
  Working directory parent is obsolete
  $ mkcommit "obsol_d''"
  created new head
  1 new unstable changesets
  $ hg debugobsolete `getid 7` `getid 8`

  $ hg summary
  parent: 3:725c380fe99b 
   add obsol_c'
  branch: default
  commit: 1 deleted, 2 unknown (clean)
  update: 2 new changesets, 2 branch heads (merge)
  unstable: 1 changesets
  divergent: 1 changesets
  $ qlog
  6
  - 909a0fb57e5d

  

should not rebase extinct changeset

#excluded 'whole rebase set is extinct and ignored.' message not in core
  $ hg rebase -b '3' -d 4 --traceback
  2 new divergent changesets
  $ hg log -G --template='{rev} - {node|short} {desc}\n'
  @  11 - 9468a5f5d8b2 add obsol_d''
  |

check bumped detection
(make an obsolete changeset public)

  $ cd local
  $ hg phase --hidden --public 11
  1 new bumped changesets
  $ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n'
  @  12 - (draft) 6db5e282cb91 add obsol_d'''
  |
  | o  11 - (public) 9468a5f5d8b2 add obsol_d''

  $ hg summary
  parent: 1[46]:50f11e5e3a63 tip (re)
   add obsolet_conflicting_d
  branch: default
  commit: (clean)
  update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re)
  bumped: 1 changesets
  $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
  $ hg log -r 'conflicting()'
  changeset:   12:6db5e282cb91
  parent:      10:2033b4e49474