$ cat >> $HGRCPATH <<EOF

  > [extensions]

  > rebase=

  > drawdag=$TESTDIR/drawdag.py

  > 

  > [phases]

  > publish=False

  > 

  > [alias]

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

  > EOF

  $ 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)

  (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

  $ cd ..

Rebasing

D onto H - simple rebase:

(this also tests that editor is invoked if '--edit' is specified, and that we

can abort or warn for colliding untracked files)

  $ hg clone -q -u . a a1

  $ cd a1

  $ hg tglog

  @  7: 'H'

  |

  | o  6: 'G'

  |/|

  o |  5: 'F'

  | |

  | o  4: 'E'

  |/

  | o  3: 'D'

  | |

  | o  2: 'C'

  | |

  | o  1: 'B'

  |/

  o  0: 'A'

  $ hg status --rev "3^1" --rev 3

  A D

  $ echo collide > D

  $ HGEDITOR=cat hg rebase -s 3 -d 7 --edit --config merge.checkunknown=warn

  rebasing 3:32af7686d403 "D"

  D: replacing untracked file

  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 D

  saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-6f7dface-rebase.hg (glob)

  $ cat D.orig

  collide

  $ rm D.orig

  $ hg tglog

  o  7: 'D'

  |

  @  6: 'H'

  |

  | o  5: 'G'

  |/|

  o |  4: 'F'

  | |

  | o  3: 'E'

  |/

  | o  2: 'C'

  | |

  | o  1: 'B'

  |/

  o  0: 'A'

  $ cd ..

D onto F - intermediate point:

(this also tests that editor is not invoked if '--edit' is not specified, and

that we can ignore for colliding untracked files)

  $ hg clone -q -u . a a2

  $ cd a2

  $ echo collide > D

  $ HGEDITOR=cat hg rebase -s 3 -d 5 --config merge.checkunknown=ignore

  rebasing 3:32af7686d403 "D"

  saved backup bundle to $TESTTMP/a2/.hg/strip-backup/32af7686d403-6f7dface-rebase.hg (glob)

  $ cat D.orig

  collide

  $ rm D.orig

  $ hg tglog

  o  7: 'D'

  |

  | @  6: 'H'

  |/

  | o  5: 'G'

  |/|

  o |  4: 'F'

  | |

  | o  3: 'E'

  |/

  | o  2: 'C'

  | |

  | o  1: 'B'

  |/

  o  0: 'A'

  $ cd ..

E onto H - skip of G:

(this also tests that we can overwrite untracked files and don't create backups

if they have the same contents)

  $ hg clone -q -u . a a3

  $ cd a3

  $ hg cat -r 4 E | tee E

  E

  $ hg rebase -s 4 -d 7

  rebasing 4:9520eea781bc "E"

  rebasing 6:eea13746799a "G"

  note: rebase of 6:eea13746799a created no changes to commit

  saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg (glob)

  $ f E.orig

  E.orig: file not found

  $ hg tglog

  o  6: 'E'

  |

  @  5: 'H'

  |

  o  4: 'F'

  |

  | o  3: 'D'

  | |

  | o  2: 'C'

  | |

  | o  1: 'B'

  |/

  o  0: 'A'

  $ cd ..

F onto E - rebase of a branching point (skip G):

  $ hg clone -q -u . a a4

  $ cd a4

  $ hg rebase -s 5 -d 4

  rebasing 5:24b6387c8c8c "F"

  rebasing 6:eea13746799a "G"

  note: rebase of 6:eea13746799a created no changes to commit

  rebasing 7:02de42196ebe "H" (tip)

  saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg (glob)

  $ hg tglog

  @  6: 'H'

  |

  o  5: 'F'

  |

  o  4: 'E'

  |

  | o  3: 'D'

  | |

  | o  2: 'C'

  | |

  | o  1: 'B'

  |/

  o  0: 'A'

  $ cd ..

G onto H - merged revision having a parent in ancestors of target:

  $ hg clone -q -u . a a5

  $ cd a5

  $ hg rebase -s 6 -d 7

  rebasing 6:eea13746799a "G"

  saved backup bundle to $TESTTMP/a5/.hg/strip-backup/eea13746799a-883828ed-rebase.hg (glob)

  $ hg tglog

  o    7: 'G'

  |\

  | @  6: 'H'

  | |

  | o  5: 'F'

  | |

  o |  4: 'E'

  |/

  | o  3: 'D'

  | |

  | o  2: 'C'

  | |

  | o  1: 'B'

  |/

  o  0: 'A'

  $ cd ..

F onto B - G maintains E as parent:

  $ hg clone -q -u . a a6

  $ cd a6

  $ hg rebase -s 5 -d 1

  rebasing 5:24b6387c8c8c "F"

  rebasing 6:eea13746799a "G"

  rebasing 7:02de42196ebe "H" (tip)

  saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg (glob)

  $ hg tglog

  @  7: 'H'

  |

  | o  6: 'G'

  |/|

  o |  5: 'F'

  | |

  | o  4: 'E'

  | |

  | | o  3: 'D'

  | | |

  +---o  2: 'C'

  | |

  o |  1: 'B'

  |/

  o  0: 'A'

  $ cd ..

These will fail (using --source):

G onto F - rebase onto an ancestor:

  $ hg clone -q -u . a a7

  $ cd a7

  $ hg rebase -s 6 -d 5

  nothing to rebase

  [1]

F onto G - rebase onto a descendant:

  $ hg rebase -s 5 -d 6

  [255]

G onto B - merge revision with both parents not in ancestors of target:

  $ hg rebase -s 6 -d 1

  rebasing 6:eea13746799a "G"

  abort: cannot rebase 6:eea13746799a without moving at least one of its parents

  [255]

  $ hg rebase --abort

  rebase aborted

These will abort gracefully (using --base):

G onto G - rebase onto same changeset:

  $ hg rebase -b 6 -d 6

  nothing to rebase - eea13746799a is both "base" and destination

  [1]

G onto F - rebase onto an ancestor:

  $ hg rebase -b 6 -d 5

  nothing to rebase

  [1]

F onto G - rebase onto a descendant:

  $ hg rebase -b 5 -d 6

  nothing to rebase - "base" 24b6387c8c8c is already an ancestor of destination eea13746799a

  [1]

C onto A - rebase onto an ancestor:

  $ hg rebase -d 0 -s 2

  rebasing 2:5fddd98957c8 "C"

  rebasing 3:32af7686d403 "D"

  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob)

  $ hg tglog

  o  7: 'D'

  |

  o  6: 'C'

  |

  | @  5: 'H'

  | |

  | | o  4: 'G'

  | |/|

  | o |  3: 'F'

  |/ /

  | o  2: 'E'

  |/

  | o  1: 'B'

  |/

  o  0: 'A'

Check rebasing public changeset

  $ hg pull --config phases.publish=True -q -r 6 . # update phase of 6

  $ hg rebase -d 0 -b 6

  nothing to rebase

  [1]

  $ hg rebase -d 5 -b 6

  abort: can't rebase public changeset e1c4361dd923

  (see 'hg help phases' for details)

  [255]

  $ hg rebase -d 5 -r '1 + (6::)'

  abort: can't rebase public changeset e1c4361dd923

  (see 'hg help phases' for details)

  [255]

  $ hg rebase -d 5 -b 6 --keep

  rebasing 6:e1c4361dd923 "C"

  rebasing 7:c9659aac0000 "D" (tip)

Check rebasing mutable changeset

Source phase greater or equal to destination phase: new changeset get the phase of source:

  $ hg id -n

  5

  $ hg rebase -s9 -d0

  rebasing 9:2b23e52411f4 "D" (tip)

  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-f942decf-rebase.hg (glob)

  $ hg id -n # check we updated back to parent

  5

  $ hg log --template "{phase}\n" -r 9

  draft

  $ hg rebase -s9 -d1

  rebasing 9:2cb10d0cfc6c "D" (tip)

  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-ddb0f256-rebase.hg (glob)

  $ hg log --template "{phase}\n" -r 9

  draft

  $ hg phase --force --secret 9

  $ hg rebase -s9 -d0

  rebasing 9:c5b12b67163a "D" (tip)

  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-4e372053-rebase.hg (glob)

  $ hg log --template "{phase}\n" -r 9

  secret

  $ hg rebase -s9 -d1

  rebasing 9:2a0524f868ac "D" (tip)

  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-cefd8574-rebase.hg (glob)

  $ hg log --template "{phase}\n" -r 9

  secret

Source phase lower than destination phase: new changeset get the phase of destination:

  $ hg rebase -s8 -d9

  rebasing 8:6d4f22462821 "C"

  saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-3441f70b-rebase.hg (glob)

  $ hg log --template "{phase}\n" -r 'rev(9)'

  secret

  $ cd ..

Test for revset

We need a bit different graph

All destination are B

  $ hg init ah

  $ cd ah

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

  adding changesets

  adding manifests

  adding file changes

  added 9 changesets with 9 changes to 9 files (+2 heads)

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

  $ hg tglog

  o  8: 'I'

  |

  o  7: 'H'

  |

  o  6: 'G'

  |

  | o  5: 'F'

  | |

  | o  4: 'E'

  |/

  o  3: 'D'

  |

  o  2: 'C'

  |

  | o  1: 'B'

  |/

  o  0: 'A'

  $ cd ..

Simple case with keep:

Source on have two descendant heads but ask for one

  $ hg clone -q -u . ah ah1

  $ cd ah1

  $ hg rebase -r '2::8' -d 1

  abort: can't remove original changesets with unrebased descendants

  (use --keep to keep original changesets)

  [255]