$ cat >> $HGRCPATH <<EOF

  > [extensions]

  > rebase=

  > mq=

  > drawdag=$TESTDIR/drawdag.py

  > 

  > [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

Highest phase of source commits is used:

  $ hg init phase

  $ cd phase

  $ hg debugdrawdag << 'EOF'

  >   D

  >   |

  > F C

  > | |

  > E B

  > |/

  > A

  > EOF

  $ hg phase --force --secret D

  $ 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 --source B --dest F

  rebasing 1:112478962961 B "B"

  rebasing 3:26805aba1e60 C "C"

  rebasing 5:f585351a92f8 D tip "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: test

  HG: branch 'default'

  HG: added B

  HG: added C

  HG: added D

  ====

  saved backup bundle to $TESTTMP/phase/.hg/strip-backup/112478962961-cb2a9b47-rebase.hg

  $ hg tglogp

  o  3: 92fa5f5fe108 secret 'Collapsed revision

  |  * B

  |  * C

  |  * D

  |

  |

  |  edited manually'

  o  2: 64a8289d2492 draft 'F'

  |

  o  1: 7fb047a69f22 draft 'E'

  |

  o  0: 426bada5c675 draft 'A'

  $ hg manifest --rev tip

  A

  B

  C

  D

  E

  F

  $ cd ..

Merge gets linearized:

  $ hg init linearized-merge

  $ cd linearized-merge

  $ hg debugdrawdag << 'EOF'

  > F D

  > |/|

  > C B

  > |/

  > A

  > EOF

  $ hg phase --force --secret D

  $ hg rebase --source B --collapse --dest F

  rebasing 1:112478962961 B "B"

  rebasing 3:4e4f9194f9f1 D "D"

  saved backup bundle to $TESTTMP/linearized-merge/.hg/strip-backup/112478962961-e389075b-rebase.hg

  $ hg tglog

  o  3: 5bdc08b7da2b 'Collapsed revision

  |  * B

  |  * D'

  o  2: afc707c82df0 'F'

  |

  o  1: dc0947a82db8 'C'

  |

  o  0: 426bada5c675 'A'

  $ hg manifest --rev tip

  A

  B

  C

  F

  $ cd ..

Custom message:

  $ hg init message

  $ cd message

  $ hg debugdrawdag << 'EOF'

  >   C

  >   |

  > D B

  > |/

  > A

  > EOF

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

  abort: message can only be specified with collapse

  [10]

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

  > env | grep HGEDITFORM

  > true

  > EOF

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

  rebasing 1:112478962961 B "B"

  rebasing 3:26805aba1e60 C tip "C"

  HGEDITFORM=rebase.collapse

  saved backup bundle to $TESTTMP/message/.hg/strip-backup/112478962961-f4131707-rebase.hg

  $ hg tglog

  o  2: 2f197b9a08f3 'custom message'

  |

  o  1: b18e25de2cf5 'D'

  |

  o  0: 426bada5c675 'A'

  $ hg manifest --rev tip

  A

  B

  C

  D

  $ cd ..

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

  $ hg init multiple-external-parents

  $ cd multiple-external-parents

  $ hg debugdrawdag << 'EOF'

  >   G

  >   |\

  >   | F

  >   | |

  >   D E

  >   |\|

  > H C B

  >  \|/

  >   A

  > EOF

  $ hg rebase -s C --dest H --collapse

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

  [20]

Rebase and collapse - E onto H:

  $ hg rebase -s E --dest H --collapse # root (E) is not a merge

  rebasing 5:49cb92066bfd E "E"

  rebasing 6:11abe3fb10b8 F "F"

  rebasing 7:64e264db77f0 G tip "G"

  saved backup bundle to $TESTTMP/multiple-external-parents/.hg/strip-backup/49cb92066bfd-ee8a8a79-rebase.hg

  $ hg tglog

  o    5: 8b2315790719 'Collapsed revision

  |\   * E

  | |  * F

  | |  * G'

  | o    4: 4e4f9194f9f1 'D'

  | |\

  o | |  3: 575c4b5ec114 'H'

  | | |

  +---o  2: dc0947a82db8 'C'

  | |

  | o  1: 112478962961 'B'

  |/

  o  0: 426bada5c675 'A'

  $ hg manifest --rev tip

  A

  C

  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.

Create repo b:

  $ hg init branch-heads

  $ cd branch-heads

  $ hg debugdrawdag << 'EOF'

  >   G

  >   |\

  >   | F

  >   | |

  >   D E

  >   |\|

  > H C B

  >  \|/

  >   A

  > EOF

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

  7:64e264db77f061f16d9132b70c5a58e2461fb630 default

  3:575c4b5ec114d64b681d33f8792853568bfb2b2c default

  $ cat $TESTTMP/branch-heads/.hg/cache/branch2-served

  64e264db77f061f16d9132b70c5a58e2461fb630 7

  575c4b5ec114d64b681d33f8792853568bfb2b2c o default

  64e264db77f061f16d9132b70c5a58e2461fb630 o default

  $ hg strip 4

  saved backup bundle to $TESTTMP/branch-heads/.hg/strip-backup/4e4f9194f9f1-5ec4b5e6-backup.hg

  $ cat $TESTTMP/branch-heads/.hg/cache/branch2-served

  11abe3fb10b8689b560681094b17fe161871d043 5

  dc0947a82db884575bb76ea10ac97b08536bfa03 o default

  575c4b5ec114d64b681d33f8792853568bfb2b2c o default

  11abe3fb10b8689b560681094b17fe161871d043 o default

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

  5:11abe3fb10b8689b560681094b17fe161871d043 default

  3:575c4b5ec114d64b681d33f8792853568bfb2b2c default

  2:dc0947a82db884575bb76ea10ac97b08536bfa03 default

  $ cd ..

Preserves external parent

  $ hg init external-parent

  $ cd external-parent

  $ hg debugdrawdag << 'EOF'

  >   H

  >   |\

  >   | G

  >   | |

  >   | F # F/E = F\n

  >   | |

  >   D E # D/D = D\n

  >   |\|

  > I C B

  >  \|/

  >   A

  > EOF

  $ hg rebase -s F --dest I --collapse # root (F) is not a merge

  rebasing 6:c82b08f646f1 F "F"

  file 'E' was deleted in local [dest] but was modified in other [source].

  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.

  What do you want to do? u

  unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')

  [240]

  $ echo F > E

  $ hg resolve -m

  (no more unresolved files)

  continue: hg rebase --continue

  $ hg rebase -c

  rebasing 6:c82b08f646f1 F "F"

  rebasing 7:a6db7fa104e1 G "G"

  rebasing 8:e1d201b72d91 H tip "H"

  saved backup bundle to $TESTTMP/external-parent/.hg/strip-backup/c82b08f646f1-f2721fbf-rebase.hg

  $ hg tglog

  o    6: 681daa3e686d 'Collapsed revision

  |\   * F

  | |  * G

  | |  * H'

  | | o  5: 49cb92066bfd 'E'

  | | |

  | o |  4: 09143c0bf13e 'D'

  | |\|

  o | |  3: 08ebfeb61bac 'I'

  | | |

  | o |  2: dc0947a82db8 'C'

  |/ /

  | o  1: 112478962961 'B'

  |/

  o  0: 426bada5c675 'A'

  $ hg manifest --rev tip

  A

  C

  D

  E

  F

  G

  I

  $ hg up tip -q

  $ cat E

  F

  $ cd ..

Rebasing from multiple bases:

  $ hg init multiple-bases

  $ cd multiple-bases

  $ hg debugdrawdag << 'EOF'

  >   C B

  > D |/

  > |/

  > A

  > EOF

  $ hg rebase --collapse -r 'B+C' -d D

  rebasing 1:fc2b737bb2e5 B "B"

  rebasing 2:dc0947a82db8 C "C"

  saved backup bundle to $TESTTMP/multiple-bases/.hg/strip-backup/dc0947a82db8-b0c1a7ea-rebase.hg

  $ hg tglog

  o  2: 2127ae44d291 'Collapsed revision

  |  * B

  |  * C'

  o  1: b18e25de2cf5 'D'

  |

  o  0: 426bada5c675 'A'

  $ cd ..

With non-contiguous commits:

  $ hg init non-contiguous

  $ cd non-contiguous

  $ cat >> .hg/hgrc <<EOF

  > [experimental]

  > evolution=all

  > EOF

  $ hg debugdrawdag << 'EOF'

  > F

  > |

  > E

  > |

  > D

  > |

  > C

  > |

  > B G

  > |/

  > A

  > EOF

BROKEN: should be allowed

  $ hg rebase --collapse -r 'B+D+F' -d G

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