$ cat >> $HGRCPATH <<EOF

  > [extensions]

  > rebase=

  > mq=

  > 

  > [phases]

  > publish=False

  > 

  > [alias]

  > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"

  > tglogp = log -G --template "{rev}: {node|short} {phase} '{desc}' {branches}\n"

  > EOF

Create repo a:

  $ hg init a

  $ cd a

  $ hg unbundle "$TESTDIR/bundles/rebase.hg"

  adding changesets

  adding manifests

  adding file changes

  added 8 changesets with 7 changes to 7 files (+2 heads)

  new changesets cd010b8cd998:02de42196ebe

  (run 'hg heads' to see heads, 'hg merge' to merge)

  $ hg up tip

  3 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg tglog

  @  7: 02de42196ebe 'H'

  |

  | o  6: eea13746799a 'G'

  |/|

  o |  5: 24b6387c8c8c 'F'

  | |

  | o  4: 9520eea781bc 'E'

  |/

  | o  3: 32af7686d403 'D'

  | |

  | o  2: 5fddd98957c8 'C'

  | |

  | o  1: 42ccdea3bb16 'B'

  |/

  o  0: cd010b8cd998 'A'

  $ cd ..

Rebasing B onto H and collapsing changesets with different phases:

  $ hg clone -q -u 3 a a1

  $ cd a1

  $ hg phase --force --secret 3

  $ cat > $TESTTMP/editor.sh <<EOF

  > echo "==== before editing"

  > cat \$1

  > echo "===="

  > echo "edited manually" >> \$1

  > EOF

  $ HGEDITOR="sh $TESTTMP/editor.sh" hg rebase --collapse --keepbranches -e --dest 7

  rebasing 1:42ccdea3bb16 "B"

  rebasing 2:5fddd98957c8 "C"

  rebasing 3:32af7686d403 "D"

  ==== before editing

  Collapsed revision

  * B

  * C

  * D

  HG: Enter commit message.  Lines beginning with 'HG:' are removed.

  HG: Leave message empty to abort commit.

  HG: --

  HG: user: Nicolas Dumazet <nicdumz.commits@gmail.com>

  HG: branch 'default'

  HG: added B

  HG: added C

  HG: added D

  ====

  $ hg tglogp

  @  5: 30882080ba93 secret 'Collapsed revision

  |  * B

  |  * C

  |  * D

  |

  |

  |  edited manually'

  o  4: 02de42196ebe draft 'H'

  |

  | o  3: eea13746799a draft 'G'

  |/|

  o |  2: 24b6387c8c8c draft 'F'

  | |

  | o  1: 9520eea781bc draft 'E'

  |/

  o  0: cd010b8cd998 draft 'A'

  $ hg manifest --rev tip

  A

  B

  C

  D

  F

  H

  $ cd ..

Rebasing E onto H:

  $ hg clone -q -u . a a2

  $ cd a2

  $ hg phase --force --secret 6

  $ hg rebase --source 4 --collapse --dest 7

  rebasing 4:9520eea781bc "E"

  rebasing 6:eea13746799a "G"

  $ hg tglog

  o  6: 7dd333a2d1e4 'Collapsed revision

  |  * E

  |  * G'

  @  5: 02de42196ebe 'H'

  |

  o  4: 24b6387c8c8c 'F'

  |

  | o  3: 32af7686d403 'D'

  | |

  | o  2: 5fddd98957c8 'C'

  | |

  | o  1: 42ccdea3bb16 'B'

  |/

  o  0: cd010b8cd998 'A'

  $ hg manifest --rev tip

  A

  E

  F

  H

  $ cd ..

Rebasing G onto H with custom message:

  $ hg clone -q -u . a a3

  $ cd a3

  $ hg rebase --base 6 -m 'custom message'

  abort: message can only be specified with collapse

  [255]

  $ cat > $TESTTMP/checkeditform.sh <<EOF

  > env | grep HGEDITFORM

  > true

  > EOF

  $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source 4 --collapse -m 'custom message' -e --dest 7

  rebasing 4:9520eea781bc "E"

  rebasing 6:eea13746799a "G"

  HGEDITFORM=rebase.collapse

  $ hg tglog

  o  6: 38ed6a6b026b 'custom message'

  |

  @  5: 02de42196ebe 'H'

  |

  o  4: 24b6387c8c8c 'F'

  |

  | o  3: 32af7686d403 'D'

  | |

  | o  2: 5fddd98957c8 'C'

  | |

  | o  1: 42ccdea3bb16 'B'

  |/

  o  0: cd010b8cd998 'A'

  $ hg manifest --rev tip

  A

  E

  F

  H

  $ cd ..

Create repo b:

  $ hg init b

  $ cd b

  $ echo A > A

  $ hg ci -Am A

  adding A

  $ echo B > B

  $ hg ci -Am B

  adding B

  $ hg up -q 0

  $ echo C > C

  $ hg ci -Am C

  adding C

  created new head

  $ hg merge

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ echo D > D

  $ hg ci -Am D

  adding D

  $ hg up -q 1

  $ echo E > E

  $ hg ci -Am E

  adding E

  created new head

  $ echo F > F

  $ hg ci -Am F

  adding F

  $ hg merge

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ hg ci -m G

  $ hg up -q 0

  $ echo H > H

  $ hg ci -Am H

  adding H

  created new head

  $ hg tglog

  @  7: c65502d41787 'H'

  |

  | o    6: c772a8b2dc17 'G'

  | |\

  | | o  5: 7f219660301f 'F'

  | | |

  | | o  4: 8a5212ebc852 'E'

  | | |

  | o |  3: 2870ad076e54 'D'

  | |\|

  | o |  2: c5cefa58fd55 'C'

  |/ /

  | o  1: 27547f69f254 'B'

  |/

  o  0: 4a2df7238c3b 'A'

  $ cd ..

Rebase and collapse - more than one external (fail):

  $ hg clone -q -u . b b1

  $ cd b1

  $ hg rebase -s 2 --dest 7 --collapse

  abort: unable to collapse on top of 7, there is more than one external parent: 1, 5

  [255]

Rebase and collapse - E onto H:

  $ hg rebase -s 4 --dest 7 --collapse # root (4) is not a merge

  rebasing 4:8a5212ebc852 "E"

  rebasing 5:7f219660301f "F"

  rebasing 6:c772a8b2dc17 "G"

  $ hg tglog

  o    5: f97c4725bd99 'Collapsed revision

  |\   * E

  | |  * F

  | |  * G'

  | @  4: c65502d41787 'H'

  | |

  o |    3: 2870ad076e54 'D'

  |\ \

  | o |  2: c5cefa58fd55 'C'

  | |/

  o /  1: 27547f69f254 'B'

  |/

  o  0: 4a2df7238c3b 'A'

  $ hg manifest --rev tip

  A

  C

  D

  E

  F

  H

  $ cd ..

Test that branchheads cache is updated correctly when doing a strip in which

the parent of the ancestor node to be stripped does not become a head and also,

the parent of a node that is a child of the node stripped becomes a head (node

3). The code is now much simpler and we could just test a simpler scenario

We keep it the test this way in case new complexity is injected.

  $ hg clone -q -u . b b2

  $ cd b2

  $ hg heads --template="{rev}:{node} {branch}\n"

  7:c65502d4178782309ce0574c5ae6ee9485a9bafa default

  6:c772a8b2dc17629cec88a19d09c926c4814b12c7 default

  $ cat $TESTTMP/b2/.hg/cache/branch2-served

  c65502d4178782309ce0574c5ae6ee9485a9bafa 7

  c772a8b2dc17629cec88a19d09c926c4814b12c7 o default

  c65502d4178782309ce0574c5ae6ee9485a9bafa o default

  $ hg strip 4

  $ cat $TESTTMP/b2/.hg/cache/branch2-served

  c65502d4178782309ce0574c5ae6ee9485a9bafa 4

  2870ad076e541e714f3c2bc32826b5c6a6e5b040 o default

  c65502d4178782309ce0574c5ae6ee9485a9bafa o default

  $ hg heads --template="{rev}:{node} {branch}\n"

  4:c65502d4178782309ce0574c5ae6ee9485a9bafa default

  3:2870ad076e541e714f3c2bc32826b5c6a6e5b040 default

  $ cd ..

Create repo c:

  $ hg init c

  $ cd c

  $ echo A > A

  $ hg ci -Am A

  adding A

  $ echo B > B

  $ hg ci -Am B

  adding B

  $ hg up -q 0

  $ echo C > C

  $ hg ci -Am C

  adding C

  created new head

  $ hg merge

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ echo D > D

  $ hg ci -Am D

  adding D

  $ hg up -q 1

  $ echo E > E

  $ hg ci -Am E

  adding E

  created new head

  $ echo F > E

  $ hg ci -m 'F'

  $ echo G > G

  $ hg ci -Am G

  adding G

  $ hg merge

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ hg ci -m H

  $ hg up -q 0

  $ echo I > I

  $ hg ci -Am I

  adding I

  created new head