rebase: use scmutil.cleanupnodes (issue5606) (BC) This patch migrates rebase to use scmutil.cleanupnodes API. It simplifies the code and makes rebase code reusable inside a transaction. This is a BC because the backup file is no longer strip-backup/*-backup.hg, but strip-backup/*-rebase.hg. The latter looks more reasonable since the directory name is "strip-backup" so there is no need to repeat "backup". I think the backup file name change is probably fine as a BC, since we have changed it before (aa4a1672583e) and didn't get complains. The end result of this series will be a much more consistent and unified backup names: command | old backup file suffix | new backup file suffix ------------------------------------------------------------------- amend | amend-backup.hg | amend.hg histedit | backup.hg (could be 2 files) | histedit.hg (single file) rebase | backup.hg | rebase.hg strip | backup.hg | backup.hg (note: backup files are under .hg/strip-backup) It also fixes issue5606 as a side effect because the new "delayedstrip" code path will carefully examine nodes (safestriproots) to make sure orphaned changesets won't get stripped by accident. Some warning messages are changed to the new "warning: orphaned descendants detected, not stripping HASHES", which provides more information about exactly what changesets are left behind. Another minor behavior change is when there is an obsoleted changeset with a successor in the destination branch, bookmarks pointing to that obsoleted changeset will not be moved. I have commented in test-rebase-obsolete.t explaining why that is more desirable.

     1

Require a destination

     2

  $ cat >> $HGRCPATH <<EOF

     3

  > [extensions]

     4

  > rebase =

     5

  > [commands]

     6

  > rebase.requiredest = True

     7

  > EOF

     8

  $ hg init repo

     9

  $ cd repo

    10

  $ echo a >> a

    11

  $ hg commit -qAm aa

    12

  $ echo b >> b

    13

  $ hg commit -qAm bb

    14

  $ hg up ".^"

    15

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

    16

  $ echo c >> c

    17

  $ hg commit -qAm cc

    18

  $ hg rebase

    19

  abort: you must specify a destination

    20

  (use: hg rebase -d REV)

    21

  [255]

    22

  $ hg rebase -d 1

    23

  rebasing 2:5db65b93a12b "cc" (tip)

    24

  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5db65b93a12b-4fb789ec-rebase.hg (glob)

    25

  $ hg rebase -d 0 -r . -q

    26

  $ HGPLAIN=1 hg rebase

    27

  rebasing 2:889b0bc6a730 "cc" (tip)

    28

  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/889b0bc6a730-41ec4f81-rebase.hg (glob)

    29

  $ hg rebase -d 0 -r . -q

    30

  $ hg --config commands.rebase.requiredest=False rebase

    31

  rebasing 2:279de9495438 "cc" (tip)

    32

  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/279de9495438-ab0a5128-rebase.hg (glob)

    33

    34

Requiring dest should not break continue or other rebase options

    35

  $ hg up 1 -q

    36

  $ echo d >> c

    37

  $ hg commit -qAm dc

    38

  $ hg log -G -T '{rev} {desc}'

    39

  @  3 dc

    40

  |

    41

  | o  2 cc

    42

  |/

    43

  o  1 bb

    44

  |

    45

  o  0 aa

    46

    47

  $ hg rebase -d 2

    48

  rebasing 3:0537f6b50def "dc" (tip)

    49

  merging c

    50

  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')

    51

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

    52

  [1]

    53

  $ echo d > c

    54

  $ hg resolve --mark --all

    55

  (no more unresolved files)

    56

  continue: hg rebase --continue

    57

  $ hg rebase --continue

    58

  rebasing 3:0537f6b50def "dc" (tip)

    59

  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-rebase.hg (glob)

    60

    61

  $ cd ..

    62

    63

Check rebase.requiredest interaction with pull --rebase

    64

  $ hg clone repo clone

    65

  updating to branch default

    66

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

    67

  $ cd repo

    68

  $ echo e > e

    69

  $ hg commit -qAm ee

    70

  $ cd ..

    71

  $ cd clone

    72

  $ echo f > f

    73

  $ hg commit -qAm ff

    74

  $ hg pull --rebase

    75

  abort: rebase destination required by configuration

    76

  (use hg pull followed by hg rebase -d DEST)

    77

  [255]

    78